1

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

@@ -197,7 +197,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             if(model != null ){
                 this.removeById(modelId);
                 fusionNumService.deleteByModelId(modelId);
-                if(StringUtils.isNotBlank(model.getModelGlbUrl())){
+                if(StringUtils.isNotBlank(model.getModelGlbUrl() ) && checkeModelGlbUrl(model.getModelGlbUrl())){
                     uploadService.deleteOssUrl(model.getModelGlbUrl());
                 }
                 if(model.getUploadId() != null){
@@ -214,6 +214,16 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
 
     }
 
+    private boolean checkeModelGlbUrl(String modelGlbUrl) {
+        LambdaQueryWrapper<Model> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Model::getModelGlbUrl,modelGlbUrl);
+        long count = this.count(wrapper);
+        if(count >1){
+            return false;
+        }
+        return true;
+    }
+
     private void updateUploadId(Integer modelId,Integer uploadId) {
         LambdaUpdateWrapper<Model> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(Model::getModelId,modelId);

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

@@ -100,13 +100,15 @@ public class SceneService implements ISceneService {
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         Boolean hasSon = false;
-        if (StringUtils.isBlank(param.getShare()) && StringUtils.isNotBlank(StpUtil.getTokenValue()) && StringUtils.isBlank(param.getDeptId())) {
+        if (StringUtils.isBlank(param.getShare()) && StringUtils.isNotBlank(StpUtil.getTokenValue())) {
             TmUser loginUser = tmUserService.getLoginUser();
             TmRole byUserId = tmRoleService.getByUserId(loginUser.getId());
             if(!byUserId.getRoleKey().equals("admin-ordinary")){
                 hasSon = true;
             }
-            param.setDeptId(tmUserService.getLoginUser().getDeptId());
+            if(StringUtils.isBlank(param.getDeptId())){
+                param.setDeptId(tmUserService.getLoginUser().getDeptId());
+            }
         }
         if (param.getCaseId() != null) {
             hasSon = false;