update

Lius

7 天以前 edfcdba2979cd573f661cd765ef027fc7e38459d

update

 src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -24,6 +24,8 @@
import org.jeecg.modules.base.entity.UserFactory;
import org.jeecg.modules.base.mapper.UserFactoryMapper;
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.mdc.entity.MdcUserProduction;
import org.jeecg.modules.mdc.mapper.MdcUserProductionMapper;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.mapper.*;
import org.jeecg.modules.system.model.SysUserSysDepartModel;
@@ -83,6 +85,8 @@
    SysRoleIndexMapper sysRoleIndexMapper;
    @Resource
    UserFactoryMapper userFactoryMapper;
    @Resource
    MdcUserProductionMapper mdcUserProductionMapper;
    @Resource
    private ISysDictService sysDictService;

@@ -518,7 +522,7 @@
        // 2. 删除用户部门关系
        line += sysUserDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getUserId, userIds));
        // 3. 删除用户产线关系
        line += userFactoryMapper.delete(new LambdaQueryWrapper<UserFactory>().in(UserFactory::getUserId, userIds));
        line += mdcUserProductionMapper.delete(new LambdaQueryWrapper<MdcUserProduction>().in(MdcUserProduction::getUserId, userIds));
        //3. 删除用户角色关系
        line += sysUserRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId, userIds));
        //4.同步删除第三方App的用户
@@ -587,9 +591,9 @@
        //step.4 保存所属产线
        if (oConvertUtils.isNotEmpty(selectedProductions)) {
            arr = selectedProductions.split(",");
            for (String factoryId : arr) {
                UserFactory userFactory = new UserFactory(user.getId(), factoryId);
                userFactoryMapper.insert(userFactory);
            for (String productionId : arr) {
                MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
                mdcUserProductionMapper.insert(mdcUserProduction);
            }
        }
        //step.5 保存设备权限
@@ -657,11 +661,11 @@
            array = productions.split(",");
        }
        //先删后加
        userFactoryMapper.delete(new QueryWrapper<UserFactory>().lambda().eq(UserFactory::getUserId, user.getId()));
        mdcUserProductionMapper.delete(new QueryWrapper<MdcUserProduction>().lambda().eq(MdcUserProduction::getUserId, user.getId()));
        if (oConvertUtils.isNotEmpty(productions)) {
            for (String factoryId : array) {
                UserFactory userFactory = new UserFactory(user.getId(), factoryId);
                userFactoryMapper.insert(userFactory);
            for (String productionId : array) {
                MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
                mdcUserProductionMapper.insert(mdcUserProduction);
            }
        }
        //step.5 修改设备权限