mlx

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScenePackageController.java

@@ -71,6 +71,7 @@ public class ScenePackageController {
             result = new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数不能为空，请检查");
         }
         ScenePackageSublistVO scenePackageSublistVO = params.get(0);
+
         String packageId = scenePackageSublistVO.getId();
         int packageLevel = scenePackageSublistVO.getPackageLevel();
         if ("1".equals(packageId)) {
@@ -78,7 +79,7 @@ public class ScenePackageController {
             params.get(0).setId("");
             result = scenePackageService.saveScenePackage(scenePackageSublistVO, params.get(0).getPackageLevel());
         } else if (0 == packageLevel) {
-            log.info("saveScenePackage() 修改保存");
+            log.info("saveScenePackage() 修改保存。");
             result = scenePackageService.updateScenePackage(params);
         } else if (1 == packageLevel) {
             log.info("saveScenePackage() 私有另存为成私有 或 公有另存为成私有");

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScenePackageService.java

@@ -122,14 +122,21 @@ public class ScenePackageService {
             //判断唯一
             po.setPackageName(vo.getSublistName());
             po.setCreateUserId(AuthUtil.getCurrentUserId());
-            if(ObjectUtil.isNull(vo.getShare())){
+            if (ObjectUtil.isNull(vo.getShare())) {
                 po.setShare("0");
-            }else{
+            } else {
                 po.setShare(vo.getShare());
             }
-           //
+            String share = po.getShare();
+            ScenePackageNewVO scenePackageNewVO;
+            if ("0".equals(share)) {
+                po.setCreateUserId(AuthUtil.getCurrentUserId());
+                scenePackageNewVO = scenePackageMapper.queryByPackageName(po);
+            } else {
+                scenePackageNewVO = scenePackageMapper.queryByPackageName(po);
+            }
             po.setPackageId(vo.getId());
-            ScenePackageNewVO scenePackageNewVO = scenePackageMapper.queryByPackageName(po);
+
             if (ObjectUtil.isNotNull(scenePackageNewVO)) {
                 return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "测试包名称:" + po.getPackageName() + "已存在，请重新命名");
             }
@@ -143,7 +150,7 @@ public class ScenePackageService {
         po.setModifyTime(TimeUtil.getNowForMysql());
         po.setModifyUserId(AuthUtil.getCurrentUserId());
         po.setIsDeleted("0");
-        if(ObjectUtil.isNull(po.getShare())){
+        if (ObjectUtil.isNull(po.getShare())) {
             po.setShare("0");
         }
         List<ScenePackageSublistPO> poList = new ArrayList<>();

simulation-resource-server/src/main/resources/mapper/scene/ScenePackageMapper.xml

@@ -173,6 +173,9 @@
             <if test="share != null and share != ''">
                 and share=#{share,jdbcType=VARCHAR}
             </if>
+            <if test="createUserId != null and createUserId != ''">
+                and create_user_id=#{createUserId}
+            </if>
         </where>
     </select>