Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 c71714508fbe3ace3543423c7700d7bbcca90056

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

@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CacheConstant;
@@ -24,8 +23,6 @@
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;
@@ -85,8 +82,8 @@
   SysRoleIndexMapper sysRoleIndexMapper;
   @Resource
   UserFactoryMapper userFactoryMapper;
   @Resource
   MdcUserProductionMapper mdcUserProductionMapper;
//   @Resource
//   MdcUserProductionMapper mdcUserProductionMapper;
   @Resource
   private ISysDictService sysDictService;

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

      //step.5 修改设备权限
      //先删后加
//      dncDevicePermissionMapper.delete(new QueryWrapper<DncDevicePermission>().lambda().eq(DncDevicePermission::getUserId, user.getId()));
@@ -834,4 +832,9 @@
   public IPage<SysUser> getUserByFactoryId(Page<SysUser> page, String factoryId, String username) {
      return userMapper.getUserByFactoryId(page,factoryId,username);
   }

   @Override
   public void editUser(SysUser sysUser) {
      userMapper.updateById(sysUser);
   }
}