Newspaper 1 năm trước cách đây
mục cha
commit
421a02f171

+ 7 - 9
huimv-receive/src/main/java/com/huimv/receive/controller/SysUserController.java

@@ -223,16 +223,14 @@ public class SysUserController {
         user.setYzbm(sysUser.getYzbm());
         user.setImgUrl(sysUser.getImgUrl());
         user.setJobType(sysUser.getJobType());
-        String s = "";
-        List<String> job = sysUser.getJob();
-        //TODO 判空
-        if(ObjectUtil.isNotEmpty(job)){
-            for (String s1 : job) {
-                s = s+s1 + ",";
-            }
-        }
 
-        user.setJob(s.substring(0, s.length() - 1));
+        if (ObjectUtil.isNotEmpty(sysUser.getJob())){
+            String s = "";
+            List<String> job = sysUser.getJob();
+            //TODO 判空
+            s = String.join(",",job);
+            user.setJob(s);
+        }
         sysUserService.updateById(user);
 
         accountMultilevelService.updateByUser(user);

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -186,7 +186,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         baseProcess.setAllLocation(allLocation);
         baseProcess.setAllLocationId(allLocationId);
         baseProcess.setAllLocationStatus(allLocationStatus);
-        baseProcess.setAllFlowId(allFlowId);
+        baseProcess.setAllFlowId(allFlowId+",0");
         baseProcess.setCurrentFlowId("0");
         baseProcess.setCurrentLocation("场外");
         baseProcess.setCurrentLocationId("0");

+ 4 - 2
huimv-receive/src/main/java/com/huimv/receive/service/impl/SysAccountMultilevelServiceImpl.java

@@ -225,8 +225,10 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectOne(new QueryWrapper<SysAccountMultilevel>().eq("user_id", id));
         if (ObjectUtil.isNotEmpty(sysAccountMultilevel)){
             sysAccountMultilevel.setUserName(sysUser.getUserName());
-            sysAccountMultilevel.setJobs(sysUser.getJob());
-            sysAccountMultilevel.setType(Integer.parseInt(sysUser.getJob().split(",")[0]));
+            if (ObjectUtil.isNotEmpty(sysUser.getJob())){
+                sysAccountMultilevel.setJobs(sysUser.getJob());
+                sysAccountMultilevel.setType(Integer.parseInt(sysUser.getJob().split(",")[0]));
+            }
             sysAccountMultilevel.setWorkLocation(sysUser.getWorkLocation());
             sysAccountMultilevel.setWorkLocationType(sysUser.getWorkLocationType());
             sysAccountMultilevel.setPhone(sysUser.getUserPhone());