维修部门班组调整

Lius

2025-07-04 77a1469028cfb204fb9fd2a29acbb8ccadf2ee7a

维修部门班组调整

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/controller/EamBaseRepairDepartController.java

@@ -15,10 +15,10 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
import org.jeecg.modules.eam.base.model.RepairDepartIdModel;
import org.jeecg.modules.eam.base.model.EamBaseRepairDepartTreeModel;
import org.jeecg.modules.eam.base.service.IEamBaseRepairDepartService;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.model.RepairDepartIdModel;
import org.jeecg.modules.system.model.EamBaseRepairDepartTreeModel;
import org.jeecg.modules.system.service.IEamBaseRepairDepartService;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/rule/OrgCodeRepDepRule.java

@@ -6,8 +6,8 @@
import org.jeecg.common.handler.IFillRuleHandler;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.common.util.YouBianCodeUtil;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
import org.jeecg.modules.eam.base.service.IEamBaseRepairDepartService;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.service.IEamBaseRepairDepartService;

import java.util.ArrayList;
import java.util.List;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -29,6 +29,7 @@
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.DepartIdModel;
import org.jeecg.modules.system.model.ProductionIdModel;
import org.jeecg.modules.system.model.RepairDepartIdModel;
import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.service.*;
import org.jeecg.modules.system.vo.SysDepartUsersVO;
@@ -99,6 +100,9 @@
    @Resource
    private IMdcUserProductionService userProductionService;

    @Resource
    private IEamBaseRepairDepartUserService eamBaseRepairDepartUserService;

    /**
     * èŽ·å–用户列表数据
     *
@@ -158,9 +162,11 @@
        if (userIds != null && userIds.size() > 0) {
            Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
            Map<String, String> useProNames = sysUserService.getProNamesByUserIds(userIds);
            Map<String, String> useRepDepNames = sysUserService.getRepDepNamesByUserIds(userIds);
            pageList.getRecords().forEach(item -> {
                item.setOrgCodeTxt(useDepNames.get(item.getId()));
                item.setProductionName(useProNames.get(item.getId()));
                item.setRepairDepartName(useRepDepNames.get(item.getId()));
            });
        }
        result.setSuccess(true);
@@ -177,6 +183,7 @@
        String selectedRoles = jsonObject.getString("selectedroles");
        String selectedDeparts = jsonObject.getString("selecteddeparts");
        String selectedProductions = jsonObject.getString("selectedProduction");
        String selectedRepairDeparts = jsonObject.getString("selectedRepairDeparts");
        try {
            SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
            user.setCreateTime(new Date());//设置创建时间
@@ -191,7 +198,7 @@
            //用户表字段org_code不能在这里设置他的值
            user.setOrgCode(null);
            // ä¿å­˜ç”¨æˆ·èµ°ä¸€ä¸ªservice ä¿è¯äº‹åŠ¡
            sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedProductions);
            sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedProductions, selectedRepairDeparts);
            baseCommonService.addLog("添加用户，username： " + user.getUsername(), CommonConstant.LOG_TYPE_2, 2);
            result.success("添加成功！");
        } catch (Exception e) {
@@ -219,6 +226,7 @@
                String roles = jsonObject.getString("selectedroles");
                String departs = jsonObject.getString("selecteddeparts");
                String productions = jsonObject.getString("selectedProduction");
                String repairDeparts = jsonObject.getString("selectedRepairDeparts");
                if (oConvertUtils.isEmpty(departs)) {
                    //vue3.0前端只传递了departIds
                    departs = user.getDepartIds();
@@ -226,10 +234,13 @@
                if (oConvertUtils.isNotEmpty(productions)) {
                    productions = user.getProductionIds();
                }
                if (oConvertUtils.isNotEmpty(repairDeparts)) {
                    repairDeparts = user.getRepairDepartIds();
                }
                //用户表字段org_code不能在这里设置他的值
                user.setOrgCode(null);
                // ä¿®æ”¹ç”¨æˆ·èµ°ä¸€ä¸ªservice ä¿è¯äº‹åŠ¡
                sysUserService.editUser(user, roles, departs, productions);
                sysUserService.editUser(user, roles, departs, productions, repairDeparts);
                result.success("修改成功!");
            }
        } catch (Exception e) {
@@ -423,6 +434,30 @@
        }
    }

    @AutoLog(value = "用户表-查询指定用户和维修部门关联的数据")
    @ApiOperation(value = "用户表-查询指定用户和维修部门关联的数据", notes = "用户表-查询指定用户和维修部门关联的数据")
    @GetMapping(value = "/userRepairDepartList")
    public Result<List<RepairDepartIdModel>> userRepairDepartList(@RequestParam(name = "userId", required = true) String userId) {
        Result<List<RepairDepartIdModel>> result = new Result<>();
        try {
            List<RepairDepartIdModel> repDepIdModelList = this.eamBaseRepairDepartUserService.queryRepairDepartIdsOfUser(userId);
            if (repDepIdModelList != null && !repDepIdModelList.isEmpty()) {
                result.setSuccess(true);
                result.setMessage("查找成功");
                result.setResult(repDepIdModelList);
            } else {
                result.setSuccess(false);
                result.setMessage("查找失败");
            }
            return result;
        } catch (Exception e) {
            log.error(e.getMessage(), e);
            result.setSuccess(false);
            result.setMessage("查找过程中出现了异常: " + e.getMessage());
            return result;
        }
    }

    /**
     * ç”Ÿæˆåœ¨æ·»åŠ ç”¨æˆ·æƒ…况下没有主键的问题,返回给前端,根据该id绑定部门数据
     *

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/EamBaseRepairDepart.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/entity/EamBaseRepairDepart.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.jeecg.modules.eam.base.entity;
package org.jeecg.modules.system.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/EamBaseRepairDepartUser.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/entity/EamBaseRepairDepartUser.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.jeecg.modules.eam.base.entity;
package org.jeecg.modules.system.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -105,6 +105,9 @@
    /**产线名称*/
    private transient String productionName;

    /**维修部门名称*/
    private transient String repairDepartName;

    /**
     * çŠ¶æ€(1：正常  2：冻结 ï¼‰
     */

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/EamBaseRepairDepartMapper.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/EamBaseRepairDepartMapper.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package org.jeecg.modules.eam.base.mapper;
package org.jeecg.modules.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;

import java.util.List;


 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/EamBaseRepairDepartUserMapper.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/EamBaseRepairDepartUserMapper.java ÐÞ¸Ä
@@ -1,8 +1,8 @@
package org.jeecg.modules.eam.base.mapper;
package org.jeecg.modules.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepartUser;
import org.jeecg.modules.system.entity.EamBaseRepairDepartUser;

import java.util.List;


 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -8,6 +8,7 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.vo.EamUserRepDepVo;
import org.jeecg.modules.system.vo.MdcUserProVo;
import org.jeecg.modules.system.vo.SysUserDepVo;

@@ -193,4 +194,9 @@
    List<SysUser> getEquipmentAdmin(@Param("roleCode") String roleCode, @Param("equipmentId") String equipmentId);

    List<SysUser> getUserByRoleCodeList(@Param("roleCodeList") List<String> roleCodeList);

    /**
     * æ ¹æ®ç”¨æˆ·Ids,查询用户所属维修部门名称信息
     */
    List<EamUserRepDepVo> getRepDepNamesByUserIds(@Param("userIds") List<String> userIds);
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/EamBaseRepairDepartMapper.xml

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/EamBaseRepairDepartMapper.xml ÐÞ¸Ä
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.base.mapper.EamBaseRepairDepartMapper">
<mapper namespace="org.jeecg.modules.system.mapper.EamBaseRepairDepartMapper">

    <!--递归查询所有子节点-->
    <select id="recursionChildren" resultType="java.lang.String">
@@ -32,7 +32,7 @@
        SELECT TOP 1 t2.id id FROM mdc_user_maintain t1 LEFT JOIN sys_maintain_depart t2 ON t1.pro_id = t2.id WHERE t1.user_id = #{userId} AND t2.org_type = '3'
    </select>

    <select id="findMaintainList" resultType="org.jeecg.modules.eam.base.entity.EamBaseRepairDepart">
    <select id="findMaintainList" resultType="org.jeecg.modules.system.entity.EamBaseRepairDepart">
        SELECT
            t1.*
        FROM

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/EamBaseRepairDepartUserMapper.xml

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/mapper/xml/EamBaseRepairDepartUserMapper.xml ÐÞ¸Ä
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.base.mapper.EamBaseRepairDepartUserMapper">
<mapper namespace="org.jeecg.modules.system.mapper.EamBaseRepairDepartUserMapper">

    <!--根据指定用户id查询产线id集合-->
    <select id="queryRepairDepartIdsByUserId" resultType="java.lang.String">

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -236,4 +236,12 @@
            and username = #{username}
        </if>
    </select>

    <!-- æŸ¥è¯¢ç”¨æˆ·çš„所属产线名称信息 -->
    <select id="getRepDepNamesByUserIds" resultType="org.jeecg.modules.system.vo.EamUserRepDepVo">
        SELECT t2.depart_name repairDepartName, t1.user_id FROM eam_base_repair_depart_user t1, eam_base_repair_depart t2 WHERE t2.id = t1.depart_id AND t1.user_id IN
        <foreach collection="userIds" index="index" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
    </select>
</mapper>

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/EamBaseRepairDepartTreeModel.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/model/EamBaseRepairDepartTreeModel.java ÐÞ¸Ä
@@ -1,10 +1,10 @@
package org.jeecg.modules.eam.base.model;
package org.jeecg.modules.system.model;

import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;

import java.io.Serializable;
import java.util.ArrayList;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/RepairDepartIdModel.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/model/RepairDepartIdModel.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package org.jeecg.modules.eam.base.model;
package org.jeecg.modules.system.model;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;

import java.io.Serializable;
import java.util.ArrayList;
@@ -56,10 +56,10 @@
     *
     * @return
     */
    public RepairDepartIdModel convertByUserMaintainDepart(EamBaseRepairDepart mdcMaintainDepart) {
        this.key = mdcMaintainDepart.getId();
        this.value = mdcMaintainDepart.getId();
        this.title = mdcMaintainDepart.getDepartName();
    public RepairDepartIdModel convertByUserRepairDepart(EamBaseRepairDepart eamBaseRepairDepart) {
        this.key = eamBaseRepairDepart.getId();
        this.value = eamBaseRepairDepart.getId();
        this.title = eamBaseRepairDepart.getDepartName();
        return this;
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IEamBaseRepairDepartService.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package org.jeecg.modules.eam.base.service;
package org.jeecg.modules.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
import org.jeecg.modules.eam.base.model.EamBaseRepairDepartTreeModel;
import org.jeecg.modules.eam.base.model.RepairDepartIdModel;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.model.EamBaseRepairDepartTreeModel;
import org.jeecg.modules.system.model.RepairDepartIdModel;

import java.util.List;


 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IEamBaseRepairDepartUserService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package org.jeecg.modules.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.system.entity.EamBaseRepairDepartUser;
import org.jeecg.modules.system.model.RepairDepartIdModel;

import java.util.List;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-03
 * @Description: ç”¨æˆ·ç»´ä¿®éƒ¨é—¨/班组
 */
public interface IEamBaseRepairDepartUserService extends IService<EamBaseRepairDepartUser> {

    /**
     * æ ¹æ®æŒ‡å®šç”¨æˆ·id查询产线信息
     */
    List<RepairDepartIdModel> queryRepairDepartIdsOfUser(String userId);

//    /**
//     * æ ¹æ®æŒ‡å®šç”¨æˆ·id查询产线id集合
//     */
//    List<String> queryProductionIdsByUserId(String userId);

}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -288,8 +288,9 @@
     * @param selectedRoles é€‰æ‹©çš„角色id，多个以逗号隔开
     * @param selectedDeparts é€‰æ‹©çš„部门id，多个以逗号隔开
     * @param selectedProductions é€‰æ‹©çš„产线id，多个以逗号隔开
     * @param selectedRepairDeparts é€‰æ‹©çš„维修部门id，多个以逗号隔开
     */
    void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedProductions);
    void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedProductions, String selectedRepairDeparts);

    /**
     * ç¼–辑用户
@@ -297,8 +298,9 @@
     * @param roles é€‰æ‹©çš„角色id，多个以逗号隔开
     * @param departs é€‰æ‹©çš„部门id，多个以逗号隔开
     * @param productions é€‰æ‹©çš„产线id，多个以逗号隔开
     * @param repairDeparts é€‰æ‹©çš„维修部门id，多个以逗号隔开
     */
    void editUser(SysUser user, String roles, String departs, String productions);
    void editUser(SysUser user, String roles, String departs, String productions, String repairDeparts);

    /**
     * userId转为username
@@ -321,6 +323,11 @@
    Map<String, String> getProNamesByUserIds(List<String> userIds);

    /**
     * æ ¹æ® userIds查询，查询用户所属产线的名称（多个产线名逗号隔开）
     */
    Map<String, String> getRepDepNamesByUserIds(List<String> userIds);

    /**
     * æ ¹æ®è§’色Id查询该角色下的所有用户信息,不分页
     *
     * @param

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/EamBaseRepairDepartImpl.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/impl/EamBaseRepairDepartImpl.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.jeecg.modules.eam.base.service.impl;
package org.jeecg.modules.system.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,16 +9,16 @@
import org.jeecg.common.constant.FillRuleConstant;
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepartUser;
import org.jeecg.modules.eam.base.mapper.EamBaseRepairDepartUserMapper;
import org.jeecg.modules.eam.base.service.IEamBaseRepairDepartService;
import org.jeecg.modules.eam.base.mapper.EamBaseRepairDepartMapper;
import org.jeecg.modules.eam.base.model.EamBaseRepairDepartTreeModel;
import org.jeecg.modules.eam.base.model.RepairDepartIdModel;
import org.jeecg.modules.eam.base.util.FindsRepairDepartsChildrenUtil;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.entity.EamBaseRepairDepartUser;
import org.jeecg.modules.system.mapper.EamBaseRepairDepartMapper;
import org.jeecg.modules.system.mapper.EamBaseRepairDepartUserMapper;
import org.jeecg.modules.system.service.IEamBaseRepairDepartService;
import org.jeecg.modules.system.model.EamBaseRepairDepartTreeModel;
import org.jeecg.modules.system.model.RepairDepartIdModel;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecg.modules.system.util.FindsRepairDepartsChildrenUtil;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/EamBaseRepairDepartUserServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
package org.jeecg.modules.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.entity.EamBaseRepairDepartUser;
import org.jeecg.modules.system.mapper.EamBaseRepairDepartUserMapper;
import org.jeecg.modules.system.model.RepairDepartIdModel;
import org.jeecg.modules.system.service.IEamBaseRepairDepartService;
import org.jeecg.modules.system.service.IEamBaseRepairDepartUserService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
 * @Description: ç”¨æˆ·ç»´ä¿®éƒ¨é—¨/班组
 * @author: LiuS
 * @create: 2023-03-27 11:58
 */
@Service
public class EamBaseRepairDepartUserServiceImpl extends ServiceImpl<EamBaseRepairDepartUserMapper, EamBaseRepairDepartUser> implements IEamBaseRepairDepartUserService {

    @Resource
    private IEamBaseRepairDepartService eamBaseRepairDepartService;

    /**
     * æ ¹æ®ç”¨æˆ·id查询维修部门/班组信息
     */
    @Override
    public List<RepairDepartIdModel> queryRepairDepartIdsOfUser(String userId) {
        LambdaQueryWrapper<EamBaseRepairDepartUser> queryUserRepDep = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<EamBaseRepairDepart> queryRepDep = new LambdaQueryWrapper<>();
        try {
            queryUserRepDep.eq(EamBaseRepairDepartUser::getUserId, userId);
            List<String> repRepDepIdList = new ArrayList<>();
            List<RepairDepartIdModel> repDepIdModelList = new ArrayList<>();
            List<EamBaseRepairDepartUser> userRepDepList = this.list(queryUserRepDep);
            if (userRepDepList != null && !userRepDepList.isEmpty()) {
                for (EamBaseRepairDepartUser eamBaseRepairDepartUser : userRepDepList) {
                    repRepDepIdList.add(eamBaseRepairDepartUser.getDepartId());
                }
                queryRepDep.in(EamBaseRepairDepart::getId, repRepDepIdList);
                List<EamBaseRepairDepart> repDepList = eamBaseRepairDepartService.list(queryRepDep);
                if (repDepList != null && !repDepList.isEmpty()) {
                    for (EamBaseRepairDepart eamBaseRepairDepart : repDepList) {
                        repDepIdModelList.add(new RepairDepartIdModel().convertByUserRepairDepart(eamBaseRepairDepart));
                    }
                }
                return repDepIdModelList;
            }
        } catch (Exception e) {
            e.fillInStackTrace();
        }
        return null;
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -25,6 +25,7 @@
import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.service.ISysDictService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.EamUserRepDepVo;
import org.jeecg.modules.system.vo.MdcUserProVo;
import org.jeecg.modules.system.vo.SysUserDepVo;
import org.jeecg.modules.system.vo.UserSelector;
@@ -79,6 +80,8 @@
    SysRoleIndexMapper sysRoleIndexMapper;
    @Resource
    MdcUserProductionMapper mdcUserProductionMapper;
    @Resource
    EamBaseRepairDepartUserMapper eamBaseRepairDepartUserMapper;
    @Resource
    private ISysDictService sysDictService;

@@ -570,7 +573,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedProductions) {
    public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedProductions, String selectedRepairDeparts) {
        //step.1 ä¿å­˜ç”¨æˆ·
        this.save(user);
        //step.2 ä¿å­˜è§’色
@@ -597,12 +600,20 @@
                mdcUserProductionMapper.insert(mdcUserProduction);
            }
        }
        //step.5 ä¿å­˜æ‰€å±žç»´ä¿®éƒ¨é—¨
        if (oConvertUtils.isNotEmpty(selectedRepairDeparts)) {
            String[] arr = selectedRepairDeparts.split(",");
            for (String repairDepartId : arr) {
                EamBaseRepairDepartUser eamBaseRepairDepartUser = new EamBaseRepairDepartUser(user.getId(), repairDepartId);
                eamBaseRepairDepartUserMapper.insert(eamBaseRepairDepartUser);
            }
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    @CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true)
    public void editUser(SysUser user, String roles, String departs, String productions) {
    public void editUser(SysUser user, String roles, String departs, String productions, String repairDeparts) {
        //step.1 ä¿®æ”¹ç”¨æˆ·åŸºç¡€ä¿¡æ¯
        this.updateById(user);
        //step.2 ä¿®æ”¹è§’色
@@ -658,6 +669,19 @@
                mdcUserProductionMapper.insert(mdcUserProduction);
            }
        }
        //step.5 ä¿®æ”¹ç»´ä¿®éƒ¨é—¨
        String[] arrayRepDep = {};
        if(oConvertUtils.isNotEmpty(repairDeparts)){
            arrayRepDep = repairDeparts.split(",");
        }
        //先删后加
        eamBaseRepairDepartUserMapper.delete(new QueryWrapper<EamBaseRepairDepartUser>().lambda().eq(EamBaseRepairDepartUser::getUserId, user.getId()));
        if (oConvertUtils.isNotEmpty(repairDeparts)) {
            for (String repairDepartId : arrayRepDep) {
                EamBaseRepairDepartUser eamBaseRepairDepartUser = new EamBaseRepairDepartUser(user.getId(), repairDepartId);
                eamBaseRepairDepartUserMapper.insert(eamBaseRepairDepartUser);
            }
        }
        //step.5 ä¿®æ”¹æ‰‹æœºå·å’Œé‚®ç®±
        // æ›´æ–°æ‰‹æœºå·ã€é‚®ç®±ç©ºå­—符串为 null
        userMapper.updateNullByEmptyString("email");
@@ -704,6 +728,21 @@
        return res;
    }

    @Override
    public Map<String, String> getRepDepNamesByUserIds(List<String> userIds) {
        List<EamUserRepDepVo> list = this.baseMapper.getRepDepNamesByUserIds(userIds);

        Map<String, String> res = new HashMap<>(5);
        list.forEach(item -> {
            if (res.get(item.getUserId()) == null) {
                res.put(item.getUserId(), item.getRepairDepartName());
            } else {
                res.put(item.getUserId(), res.get(item.getUserId()) + "," + item.getRepairDepartName());
            }
        });
        return res;
    }

    // æ ¹æ®è§’色Id查询该角色下的所有用户信息
    @Override
    public List<SysUser> getAllUsersByRoleId(String roleId) {

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsRepairDepartsChildrenUtil.java

ÎļþÃû´Ó lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/util/FindsRepairDepartsChildrenUtil.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package org.jeecg.modules.eam.base.util;
package org.jeecg.modules.system.util;

import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.base.entity.EamBaseRepairDepart;
import org.jeecg.modules.eam.base.model.EamBaseRepairDepartTreeModel;
import org.jeecg.modules.eam.base.model.RepairDepartIdModel;
import org.jeecg.modules.system.entity.EamBaseRepairDepart;
import org.jeecg.modules.system.model.EamBaseRepairDepartTreeModel;
import org.jeecg.modules.system.model.RepairDepartIdModel;

import java.util.ArrayList;
import java.util.List;

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/vo/EamUserRepDepVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.system.vo;

import lombok.Data;

/**
 * @Author: Lius
 * @CreateTime: 2025-07-03
 * @Description:
 */
@Data
public class EamUserRepDepVo {
    private String userId;
    private String repairDepartName;
}