From ddb366d7c5e8f0d57367f9d80e050ca4e2707da9 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 16 Nov 2022 15:19:19 +0800
Subject: [PATCH] =?UTF-8?q?viewer=E8=AE=BE=E7=BD=AE=E5=93=81=E7=89=8C?=
 =?UTF-8?q?=E8=B7=9F=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E6=97=B6=E5=81=9A?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/enums/DictCodeEnum.java  |  1 +
 .../service/impl/SysUserServiceImpl.java      | 33 +++++++++++--------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/DictCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/DictCodeEnum.java
index 74d79ca0d..68fd29027 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/DictCodeEnum.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/DictCodeEnum.java
@@ -3,6 +3,7 @@ package com.jero.modules.enums;
 public enum DictCodeEnum {
 
     DUTY_TERRITORY("责任领域","duty_territory"),
+    BRAND("品牌","brand"),
     ;
     String name;
     String value;
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index f5c2df47b..003994bec 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -15,16 +15,14 @@ import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.UUIDGenerator;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.base.service.BaseCommonService;
+import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.system.entity.*;
 import com.jero.modules.system.enums.PPSyncEnum;
 import com.jero.modules.system.enums.ProjectRoleEnum;
 import com.jero.modules.system.enums.RoleEnum;
 import com.jero.modules.system.mapper.*;
 import com.jero.modules.system.model.SysUserSysDepartModel;
-import com.jero.modules.system.service.IProjectUserBrandService;
-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.service.*;
 import com.jero.modules.system.vo.SysUserDepVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -78,7 +76,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	private IProjectUserBrandService projectUserBrandService;
 	@Autowired
 	private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
-
+	@Autowired
+	private ISysDictItemService sysDictItemService;
 
 	@Override
     @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
@@ -725,19 +724,27 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			projectUserDutyTerritoryService.remove(dutyTerritoryDelWrapper);
 
 			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(",")) {
-					ProjectUserDutyTerritory projectUserDutyTerritory = new ProjectUserDutyTerritory();
-					projectUserDutyTerritory.setUserId(userId);
-					projectUserDutyTerritory.setDutyTerritory(dutyTerritory);
-					projectUserDutyTerritoryList.add(projectUserDutyTerritory);
+					//校验责任领域是否合法
+					if (dictItemValue.contains(dutyTerritory)) {
+						ProjectUserDutyTerritory projectUserDutyTerritory = new ProjectUserDutyTerritory();
+						projectUserDutyTerritory.setUserId(userId);
+						projectUserDutyTerritory.setDutyTerritory(dutyTerritory);
+						projectUserDutyTerritoryList.add(projectUserDutyTerritory);
+					}
 				}
 			}
 			if (ObjectUtils.isNotEmpty(brands)) {
+				List<String> dictItemValue = sysDictItemService.selectItemsByDictCode(DictCodeEnum.BRAND.getValue()).stream().map(SysDictItem::getItemValue).collect(Collectors.toList());
 				for (String brand : brands.split(",")) {
-					ProjectUserBrand projectUserBrand = new ProjectUserBrand();
-					projectUserBrand.setUserId(userId);
-					projectUserBrand.setBrandType(brand);
-					projectUserBrandList.add(projectUserBrand);
+					//校验品牌是否合法
+					if (dictItemValue.contains(brand)) {
+						ProjectUserBrand projectUserBrand = new ProjectUserBrand();
+						projectUserBrand.setUserId(userId);
+						projectUserBrand.setBrandType(brand);
+						projectUserBrandList.add(projectUserBrand);
+					}
 				}
 			}
 		}