添加控制台角色，用戶添加回传影像

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -526,6 +526,8 @@ public class SysUserController extends BaseController {
             sysUser.setReferrerId(operator != null ? operator.getId() : "");
             sysUser.setReferrerName(operator != null ? operator.getName() : "");
             sysUserVo.setSysUser(sysUser);
+            List<EsmUserImageQueryVo> esmUserImageQueryVo = esmUserImageService.getEsmUserImageQueryVo(userId);
+            sysUserVo.setEsmUserImageVo(esmUserImageQueryVo);
             return HttpResult.ok(sysUserVo);
         }
         // 查询推荐人

src/main/java/com/ydtech/modules/admin/controller/kzt/KZTPermissionController.java

@@ -63,8 +63,7 @@ public class KZTPermissionController extends BaseController {
      *  @Description: 控制台角色刪除
      */
     @ApiOperation(value = "控制台数据权限通过菜单id查询数据")
-    @PostMapping(value = "/findByMenuId")
-    @Transactional
+    @GetMapping(value = "/findByMenuId")
     public HttpResult findByMenuId(Long menuId) {
         if(menuId==null){
             throw  new SystemException("菜单id不能为空");
@@ -89,7 +88,9 @@ public class KZTPermissionController extends BaseController {
             throw  new SystemException("菜单id不能为空");
         }
         try{
-
+            LambdaQueryWrapper<KztDataPermission> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(KztDataPermission::getMenuId, menuId);
+            kztDataPermissionService.getBaseMapper().delete(lqw);
         }catch(Exception e){
             return HttpResult.error("删除失败");
         }

src/main/java/com/ydtech/modules/admin/dao/SysRoleMenuMapper.java

@@ -22,11 +22,11 @@ public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
     List<SysMenu> gainSysMenuIds(@Param("userId") String userId);
 
 
-    String SysMenuSql_kzt = "select t.id, t.name, t.parent_id, t.url, t.perms, t.type, t.icon, t.order_num, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag,p.parent_id as parentId," +
+    String SysMenuSql_kzt = "select t.id, t.name, t.parent_id, t.url, t.perms, t.type, t.icon, t.order_num, t.create_by, t.create_time, t.last_update_by, t.last_update_time, t.del_flag," +
             " pp.NAME AS parentName," +
             " pp.url AS parentUrl  from sys_menu t  left join sys_menu pp ON t.parent_id = pp.id ";
-    String sysRoleMenuIdSql_kzt = " where t.id in (select menu_id from sys_role_menu t1 left join sys_user_role t2 on t1.role_id=t2.role_id where t2.user_id='${userId}') and del_flag=0  and  t.sys_type='${sysType}'";
-    String SysMenuSqlT1_kzt = SysMenuSql + sysRoleMenuIdSql;
+    String sysRoleMenuIdSql_kzt = " where t.id in (select menu_id from sys_role_menu_kzt t1 left join sys_user_role_kzt t2 on t1.role_id=t2.role_id where t2.user_id='${userId}') and t.del_flag=0  and  t.sys_type='${sysType}'";
+    String SysMenuSqlT1_kzt = SysMenuSql_kzt + sysRoleMenuIdSql_kzt;
 
     @Select(SysMenuSqlT1_kzt)
     List<SysMenu> gainMenuIdsByUserId(@Param("userId") String userId, @Param("sysType") String sysType);

src/main/java/com/ydtech/modules/admin/service/impl/SysMenuServiceImpl.java

@@ -149,7 +149,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
             menus= sysMenuMapper.findBySysTypeList(sysType,"0");
            // menus = list(lqw);
         }else{
-            return sysRoleMenuService.gainMenuIdsByUserId(userId,sysType);
+            menus= sysRoleMenuService.gainMenuIdsByUserId(userId,sysType);
         }
         for (SysMenu menu : menus) {
             if (menu.getParentId() == null || menu.getParentId().equalsIgnoreCase("0")) {

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -594,50 +594,66 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         } else {
             return HttpResult.error("密码不能为空");
         }
+        String userId="";
         if ("19".equals(sysUser.getRoleId())) {//19 出单员 校验机构和业务员机构是否一致
-            return checkChuDanUser(sysUser);
-        }
-        String userId = gainNextUserId(sysUser.getDeptId());
-
-        if (RoleConstants.R22.getCode().equals(sysUser.getRoleId())) {//22	后线人员
-            if (!SysConstants.isAdministration(userId)) {
-                throw new SystemException("后线人员只能公司部门中");
+            // add by  hxl  2024-08-20
+            // return checkChuDanUser(sysUser);
+            if (StringUtils.isEmpty(sysUser.getReferrerId())) {
+                return HttpResult.error("业务员工号不能为空");
             }
-        }
-
-        sysUser.setId(userId);
-        save(sysUser);
+            //归属业务员和出单员部门必须一致
+            SysUser user = getById(sysUser.getReferrerId());
+            if (user == null || !user.getDeptId().equals(sysUser.getDeptId())) {
+                return HttpResult.error("出单员机构必须和归属业务员机构一致");
+            }
+            sysUser.setOperatorCode(sysUser.getReferrerId());
+            if (StringUtils.isEmpty(sysUser.getId())) {
+                userId = gainNextUserId(sysUser.getDeptId());
+                sysUser.setId(userId);
+                save(sysUser);
+                //角色配置
+                SysUserRole userRole = new SysUserRole();
+                userRole.setUserId(sysUser.getId());
+                userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
+                sysUserRoleService.save(userRole);
+            } else {
+                userId = "";
+                updateById(sysUser);
+            }
+        }else{
+            userId = gainNextUserId(sysUser.getDeptId());
 
-        //角色配置
-        SysUserRole userRole = new SysUserRole();
-        userRole.setUserId(sysUser.getId());
-        userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
-        sysUserRoleService.save(userRole);
-
-        if (StringUtils.isNotEmpty(sysUser.getReferrerId())) {
-            //推荐人
-            esmUserReferrerService.addReferrer(sysUser.getReferrerId(), userId);
-        } else if ("20".equals(sysUser.getRoleId()) || "21".equals(sysUser.getRoleId())) {
-            //如果是 团队长或代码人 并且没有推荐人 则默认推荐人为自己
-            esmUserReferrerService.addReferrer(sysUser.getId(), userId);
-        }
+            if (RoleConstants.R22.getCode().equals(sysUser.getRoleId())) {//22	后线人员
+                if (!SysConstants.isAdministration(userId)) {
+                    throw new SystemException("后线人员只能公司部门中");
+                }
+            }
 
-//        EsmUserReferrer eur = new EsmUserReferrer();
-//        eur.setId(sysUser.getId());
-//        eur.setReferrerName(sysUser.getReferrerName());
-//        eur.setReferrerId(sysUser.getReferrerId());
-//        eur.setLevel(1);
-//
-//        esmUserReferrerService.save(eur);
+            sysUser.setId(userId);
+            save(sysUser);
 
-        SysUserInfo userInfo = sysUserVo.getSysUserInfo();
-        if (userInfo != null) {
-            userInfo.setId(sysUser.getId());
-        }
+            //角色配置
+            SysUserRole userRole = new SysUserRole();
+            userRole.setUserId(sysUser.getId());
+            userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
+            sysUserRoleService.save(userRole);
+            if (StringUtils.isNotEmpty(sysUser.getReferrerId())) {
+                //推荐人
+                esmUserReferrerService.addReferrer(sysUser.getReferrerId(), userId);
+            } else if ("20".equals(sysUser.getRoleId()) || "21".equals(sysUser.getRoleId())) {
+                //如果是 团队长或代码人 并且没有推荐人 则默认推荐人为自己
+                esmUserReferrerService.addReferrer(sysUser.getId(), userId);
+            }
+            SysUserInfo userInfo = sysUserVo.getSysUserInfo();
+            if (userInfo != null) {
+                userInfo.setId(sysUser.getId());
+            }
 //        userInfo.setId(sysUser.getId());
-        sysUserInfoService.save(userInfo);
+            sysUserInfoService.save(userInfo);
+        }
         List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
-        List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, userId)).collect(Collectors.toList());
+        String finalUserId = userId;
+        List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
 
         return HttpResult.ok("新增成功");
@@ -719,40 +735,63 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUser.setPassword(sysUser_org.getPassword());
             sysUser.setSalt(sysUser_org.getSalt());
         }
-
         if ("19".equals(sysUser.getRoleId())) {//19 出单员 校验机构和业务员机构是否一致
-            return checkChuDanUser(sysUser);
-        }
-
-        sysUser.setStatus(sysUserVo.getSysUser().getStatus());
-        updateById(sysUser);
-
-        //角色配置
-        SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
-        sysUserRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
-        sysUserRole.setLastUpdateBy(sysUser.getCreateBy());
-        sysUserRole.setLastUpdateTime(new Date());
-        sysUserRoleService.updateById(sysUserRole);
+            // add by  hxl  2024-08-20
+            // return checkChuDanUser(sysUser);
+            if (StringUtils.isEmpty(sysUser.getReferrerId())) {
+                return HttpResult.error("业务员工号不能为空");
+            }
+            //归属业务员和出单员部门必须一致
+            SysUser user = getById(sysUser.getReferrerId());
+            if (user == null || !user.getDeptId().equals(sysUser.getDeptId())) {
+                return HttpResult.error("出单员机构必须和归属业务员机构一致");
+            }
+            sysUser.setOperatorCode(sysUser.getReferrerId());
+            if (StringUtils.isEmpty(sysUser.getId())) {
+                userId = gainNextUserId(sysUser.getDeptId());
+                sysUser.setId(userId);
+                save(sysUser);
+                //角色配置
+                SysUserRole userRole = new SysUserRole();
+                userRole.setUserId(sysUser.getId());
+                userRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
+                sysUserRoleService.save(userRole);
+            } else {
+                userId = "";
+                updateById(sysUser);
+            }
+        }else{
+            sysUser.setStatus(sysUserVo.getSysUser().getStatus());
+            updateById(sysUser);
 
-        if (StringUtils.isNotEmpty(sysUser.getReferrerId())) {
-            //推荐人
-            esmUserReferrerService.addReferrer(sysUser.getReferrerId(), userId);
-        }
+            //角色配置
+            SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
+            sysUserRole.setRoleId(StringUtils.toLong(sysUser.getRoleId()));
+            sysUserRole.setLastUpdateBy(sysUser.getCreateBy());
+            sysUserRole.setLastUpdateTime(new Date());
+            sysUserRoleService.updateById(sysUserRole);
+
+            if (StringUtils.isNotEmpty(sysUser.getReferrerId())) {
+                //推荐人
+                esmUserReferrerService.addReferrer(sysUser.getReferrerId(), userId);
+            }
 
-        //用户详情信息
-        SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
-        sysUserInfo.setId(userId);
-        if (null == sysUserInfo.getRemark()) {
-            sysUserInfo.setRemark("");
+            //用户详情信息
+            SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();
+            sysUserInfo.setId(userId);
+            if (null == sysUserInfo.getRemark()) {
+                sysUserInfo.setRemark("");
+            }
+            sysUserInfoService.saveOrUpdate(sysUserInfo);
         }
-        sysUserInfoService.saveOrUpdate(sysUserInfo);
         // 影像资料
         LambdaQueryWrapper<EsmUserImage> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(EsmUserImage::getUserId, userId);
         esmUserImageService.remove(wrapper);
 
         List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
-        List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, userId)).collect(Collectors.toList());
+        String finalUserId = userId;
+        List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
         esmUserImageService.saveBatch(esmUserImages);
 
         if (UserWorkStatus.UWS_5.getCode() == beStatus ||