lyhzzz 4 月之前
父节点
当前提交
ed0eba8a1c

+ 1 - 4
src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -431,14 +431,11 @@ public class LaserService {
         return null ;
     }
 
-    public void saveBatchCooperation(List<String> numList2,List<String> snCodeList, String userName, List<String> userNameList,String type,String operatingMode) {
+    public void saveBatchCooperation(List<String> numList2,List<String> snCodeList, List<String> userNameList,String type,String operatingMode) {
         log.info(numList2.size() +"---------"+snCodeList.size());
         if(numList2.isEmpty() && snCodeList.isEmpty()){
             return;
         }
-        if(userNameList.isEmpty()){
-            userNameList.add(userName);
-        }
         HashMap<String,Object> map = new HashMap<>();
         map.put("numList",numList2);
         map.put("type",type);

+ 2 - 2
src/main/java/com/fdkankan/ucenter/service/impl/SceneCooperationServiceImpl.java

@@ -288,7 +288,7 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
 
         if(param.getUserNameList() == null || param.getUserNameList().isEmpty()){
             this.deleteCooperationList(numList,null);
-            laserService.saveBatchCooperation(numList,new ArrayList<>(),loginUserName,param.getUserNameList(),"scene","update");
+            laserService.saveBatchCooperation(numList,new ArrayList<>(),param.getUserNameList(),"scene","update");
             return null;
         }
         if(param.getUserNameList().contains( loginUserName)){
@@ -523,7 +523,7 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
             return;
         }
         String operatingMode = numList.size() > 1 ? "add" :"update";
-        laserService.saveBatchCooperation(new ArrayList<>(numList1),snCodeList,LoginUser.getUserName(),collect,type,operatingMode);
+        laserService.saveBatchCooperation(new ArrayList<>(numList1),snCodeList,collect,type,operatingMode);
 
     }