Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/CabinetPolicemanReq.java

@@ -38,6 +38,8 @@ public class CabinetPolicemanReq extends BaseRequest {
      */
     private String finger;
 
+    private String password;
+
     private  List<Long> RolesList;
 
 }
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/PoliceListReq.java

@@ -19,6 +19,8 @@ public class PoliceListReq {
     private String name;
 
     private String finger;
+
+    private  String password;
         //    /**
     //     * 角色id列表
     //     */

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java

@@ -330,6 +330,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         sysUser.setAccount(accountSet);
         sysUser.setNickName(req.getName());
         sysUser.setRealName(req.getName());
+        sysUser.setPassword(req.getPassword());
         SysUserCreateFactory.fillAddSysUser(sysUser);
         sysUser.setAvatar(FileConstant.DEFAULT_AVATAR_FILE_ID);
         sysUser.setDelFlag(LogicDelEnum.N.getCode());
@@ -355,6 +356,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         BeanPlusUtil.copyProperties(req,sysUser);
         sysUser.setAccount(accountSet);
         sysUser.setNickName(req.getName());
+        sysUser.setPassword(req.getPassword());
         sysUser.setRealName(req.getName());
         SysUserCreateFactory.fillAddSysUser(sysUser);
         sysUser.setAvatar(FileConstant.DEFAULT_AVATAR_FILE_ID);
@@ -584,6 +586,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         }
         one.setPhoto(req.getFaceInfo());
         one.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+        SysUser user= sysUserService.getById(req.getUserId());
+        user.setPassword(req.getPassword());
+        sysUserService.updateById(user);
         //修改角色
         if (req.getRolesList().size()>0){
 //            sysUserRoleService.removeBatchByIds(req.getRolesList());
@@ -702,14 +707,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             // 处理新增和修改
             for (PoliceListReq reqPolice : policeReqList) {
                 Policeman dbPolice = findPoliceById(policeList, reqPolice.getPoliceID());
-
+                SysUser user= sysUserService.getById(dbPolice.getUserId());
                 if (dbPolice == null) {
                     // 新增数据
                     Policeman newPolice = convertToPoliceman(reqPolice, orgList.getOrgId());
                     toAdd.add(newPolice);
                 } else {
                     // 修改数据
-                    Policeman updatedPolice = updatePoliceman(dbPolice, reqPolice, orgInfo, cabinetOrg);
+                    Policeman updatedPolice = updatePoliceman(user,dbPolice, reqPolice, orgInfo, cabinetOrg);
                     toUpdate.add(updatedPolice);
                 }
             }
@@ -801,14 +806,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     }
 
     // 辅助方法：更新 Policeman 对象的属性
-    private Policeman updatePoliceman(Policeman dbPolice, PoliceListReq reqPolice, PubOrg org, Cabinet cabinet) {
+    private Policeman updatePoliceman(SysUser user, Policeman dbPolice, PoliceListReq reqPolice, PubOrg org, Cabinet cabinet) {
         CabinetBox cb = cabinetBoxService.getById(reqPolice.getCabinetBoxId());
         if (cb.getBoxName() == null) {
             cb.setBoxName("");
         }
         // 判断警员是否存在
         // 判断传入的修改的警员编号与本身编号一致，如果一致则无所谓，如果不一致则需要判断修改的警员编号是否已经存在
-
+        user.setPassword(reqPolice.getPassword());
         dbPolice.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         List<PoliceEquipment> policeEqsList = policeEquipmentService.list(new LambdaQueryWrapper<PoliceEquipment>()
                 .eq(PoliceEquipment::getPoliceId, dbPolice.getId()));
@@ -957,6 +962,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         dbPolice.setOrgId(Long.valueOf(org.getOrgId()));
         dbPolice.setState(1);
         BeanPlusUtil.copyProperties(reqPolice, dbPolice);
+        sysUserService.updateById(user);
         return dbPolice;
     }