1

src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -105,7 +105,7 @@ public class SceneService implements ISceneService {
                 sceneVo.setDeptName(tmDepartment.getName());
             }
             sceneVo.setStatus(setLaserStatus(sceneVo.getStatus(),sceneVo.getPayStatus()));
-            sceneVo.setType(CameraUtil.getTypeByCameraType(sceneVo.getCameraType(),sceneVo.getIsObj()));
+            sceneVo.setType(CameraUtil.getTypeByCameraType(sceneVo.getCameraType(),param.getIsObj()));
             if(modelingMap.get(sceneVo.getNum()) != null && !modelingMap.get(sceneVo.getNum())){
                 sceneVo.setStatus(5);
             }

src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -309,9 +309,11 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
             this.removeById(tmProject.getId());
             return;
         }
-        TmProject byProjectSn = this.getByProjectSn(tmProject.getProjectSn());
-        if(byProjectSn != null && !byProjectSn.getId().equals(tmProject.getId())){
-            throw new BusinessException(ResultCode.PROJECT_EXITS);
+        if(tmProject.getIsDelete() != 2 && StringUtils.isNotBlank(tmProject.getProjectSn())){
+            TmProject byProjectSn = this.getByProjectSn(tmProject.getProjectSn());
+            if(byProjectSn != null && !byProjectSn.getId().equals(tmProject.getId())){
+                throw new BusinessException(ResultCode.PROJECT_EXITS);
+            }
         }
         TmUser tmUser = tmUserService.getLoginUser();
         tmProject.setEditorId(tmUser.getId());

src/main/java/com/fdkankan/fusion/service/impl/TmUserServiceImpl.java

@@ -303,7 +303,7 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
         if(deptIds.isEmpty()){
             return PageInfo.PageInfoEmpty();
         }
-        if(StringUtils.isNotBlank(deptId)){
+        if(StringUtils.isNotBlank(deptIdParam)){
             wrapper.eq(TmUser::getDeptId,deptIdParam);
         }