WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

viewer设置品牌跟责任领域时做校验

Browse Source
This commit is contained in:
CD
2022-11-16 15:19:19 +08:00
parent 1d1caaf5f0
commit ddb366d7c5
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/DictCodeEnum.java
+1
View File
@@ -3,6 +3,7 @@ package com.jero.modules.enums;
public enum DictCodeEnum { public enum DictCodeEnum {
DUTY_TERRITORY("责任领域","duty_territory"), DUTY_TERRITORY("责任领域","duty_territory"),
BRAND("品牌","brand"),
; ;
String name; String name;
String value; String value;
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+20 -13
View File
@@ -15,16 +15,14 @@ import com.jero.common.util.PasswordUtil;
import com.jero.common.util.UUIDGenerator; import com.jero.common.util.UUIDGenerator;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.base.service.BaseCommonService;
import com.jero.modules.enums.DictCodeEnum;
import com.jero.modules.system.entity.*; import com.jero.modules.system.entity.*;
import com.jero.modules.system.enums.PPSyncEnum; import com.jero.modules.system.enums.PPSyncEnum;
import com.jero.modules.system.enums.ProjectRoleEnum; import com.jero.modules.system.enums.ProjectRoleEnum;
import com.jero.modules.system.enums.RoleEnum; import com.jero.modules.system.enums.RoleEnum;
import com.jero.modules.system.mapper.*; import com.jero.modules.system.mapper.*;
import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.model.SysUserSysDepartModel;
import com.jero.modules.system.service.IProjectUserBrandService; import com.jero.modules.system.service.*;
import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
import com.jero.modules.system.service.ISysRoleService;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.system.vo.SysUserDepVo; import com.jero.modules.system.vo.SysUserDepVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@@ -78,7 +76,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
private IProjectUserBrandService projectUserBrandService; private IProjectUserBrandService projectUserBrandService;
@Autowired @Autowired
private IProjectUserDutyTerritoryService projectUserDutyTerritoryService; private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
@Autowired
private ISysDictItemService sysDictItemService;
@Override @Override
@CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@@ -725,19 +724,27 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
projectUserDutyTerritoryService.remove(dutyTerritoryDelWrapper); projectUserDutyTerritoryService.remove(dutyTerritoryDelWrapper);
if (ObjectUtils.isNotEmpty(dutyTerritories)) { if (ObjectUtils.isNotEmpty(dutyTerritories)) {
List<String> dictItemValue = sysDictItemService.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()).stream().map(SysDictItem::getItemValue).collect(Collectors.toList());
for (String dutyTerritory : dutyTerritories.split(",")) { for (String dutyTerritory : dutyTerritories.split(",")) {
ProjectUserDutyTerritory projectUserDutyTerritory = new ProjectUserDutyTerritory(); //校验责任领域是否合法
projectUserDutyTerritory.setUserId(userId); if (dictItemValue.contains(dutyTerritory)) {
projectUserDutyTerritory.setDutyTerritory(dutyTerritory); ProjectUserDutyTerritory projectUserDutyTerritory = new ProjectUserDutyTerritory();
projectUserDutyTerritoryList.add(projectUserDutyTerritory); projectUserDutyTerritory.setUserId(userId);
projectUserDutyTerritory.setDutyTerritory(dutyTerritory);
projectUserDutyTerritoryList.add(projectUserDutyTerritory);
}
} }
} }
if (ObjectUtils.isNotEmpty(brands)) { if (ObjectUtils.isNotEmpty(brands)) {
List<String> dictItemValue = sysDictItemService.selectItemsByDictCode(DictCodeEnum.BRAND.getValue()).stream().map(SysDictItem::getItemValue).collect(Collectors.toList());
for (String brand : brands.split(",")) { for (String brand : brands.split(",")) {
ProjectUserBrand projectUserBrand = new ProjectUserBrand(); //校验品牌是否合法
projectUserBrand.setUserId(userId); if (dictItemValue.contains(brand)) {
projectUserBrand.setBrandType(brand); ProjectUserBrand projectUserBrand = new ProjectUserBrand();
projectUserBrandList.add(projectUserBrand); projectUserBrand.setUserId(userId);
projectUserBrand.setBrandType(brand);
projectUserBrandList.add(projectUserBrand);
}
} }
} }
} }