Merge branch 'dev' of http://gitlab.91isoft.com:90/wangcong/entrance_api- into dev

src/main/java/org/rcisoft/sys/sysuser/controller/SysUserController.java

@@ -150,6 +150,15 @@ public class SysUserController extends CyPaginationController<SysUser> {
                 sysUserServiceImpl.findAllByData(sysUser));
     }
 
+    //查询所有数据字典
+    @GetMapping(value = "/queryDataAll/{dictType:\\w+}")
+    public CyResult queryDataAll(SysUser sysUser) {
+        return CyResultGenUtil.builder(new CyPersistModel(1),
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                sysUserServiceImpl.findAllByDataAll(sysUser));
+    }
+
     //查询部门
     @GetMapping(value = "/queryDept")
     public CyResult queryDept(SysUser sysUser) {

src/main/java/org/rcisoft/sys/sysuser/dao/SysDictDataRepositorys.java

@@ -30,6 +30,8 @@ public interface SysDictDataRepositorys extends CyBaseMapper<SysDictData> {
 
     //查询字典
     List<SysUser> queryData(SysUser sysUser);
+    //查询全部字典
+    List<SysUser> queryDataAll(SysUser sysUser);
 
     //根据职位id查询职位字典
     List<SysDictData> queryDataByPosition(String position);

src/main/java/org/rcisoft/sys/sysuser/service/SysUserService.java

@@ -76,6 +76,8 @@ public interface SysUserService {
     //查询字典
     List<SysUser> findAllByData(SysUser sysUser);
 
+    List<SysUser> findAllByDataAll(SysUser sysUser);
+
     //查询部门
     List<SysUser> findAllByDept(SysUser sysUser);
 

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java

@@ -192,7 +192,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
         }
         line = sysUserRepositorys.updateSysUser(sysUser);
         // 修改员工和外部系统同步数据
-        if(sysUser.getUserType().equals("0")) {
+        if (sysUser.getUserType().equals("0")) {
            /* if(!jieLinkService.pushModifyUserData(sysUser))
                 try {
                     throw new CyServiceException(500, "修改员工失败，请稍后重试");
@@ -331,6 +331,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
 
     }
 
+    public List<SysUser> findAllByDataAll(SysUser sysUser) {
+        return sysDictDataRepositorys.queryDataAll(sysUser);
+
+    }
+
     public List<SysUser> findAllByDept(SysUser sysUser) {
         return sysDeptRepositorys.queryDept(sysUser);
 

src/main/java/org/rcisoft/sys/visit/service/impl/VisitInfomationServiceImpl.java

@@ -674,7 +674,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
                 }
                 // 设置邀访信息访问区域
                 if (visitInfoDto.getVisitRegion().length() > 0) {
-                    String[] regions = visitInfoDto.getVisitRegion().split(",");
+                    String[] regions = visitInfoDto.getVisitRegion().split(",|，");
                     visitInfoMation.setVisitRegion(visitInfoDto.getVisitRegion());
                     String regionCode = "";
                     for (String region : regions) {
@@ -698,9 +698,9 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
                 visitInfoMation.setVisitRealTime(dateFormat.parse(time));
                 List<VisitUser> userList = new ArrayList<>();
                 // 判断访客姓名和手机号是否数量匹配
-                List<String> visitName = Arrays.asList(visitInfoDto.getVisitName().split(",")).stream()
+                List<String> visitName = Arrays.asList(visitInfoDto.getVisitName().split(",|，")).stream()
                         .filter(u -> StringUtils.isNotEmpty(u)).collect(Collectors.toList());
-                List<String> visitPhone = Arrays.asList(visitInfoDto.getVisitPhone().split(",")).stream()
+                List<String> visitPhone = Arrays.asList(visitInfoDto.getVisitPhone().split(",|，")).stream()
                         .filter(p -> StringUtils.isNotEmpty(p)).distinct()
                         .collect(Collectors.toList());
                 for (int i = 0; i < visitName.size(); i++) {

src/main/resources/mapper/SysDictDataRepositorys.xml

@@ -55,6 +55,13 @@
           and del_flag = 0
     </select>
 
+    <select id="queryDataAll" resultMap="BaseResultMap">
+        SELECT *
+        FROM sys_dict_data
+        WHERE dict_type = #{dictType}
+          and del_flag = 0
+    </select>
+
     <select id="queryDataByPosition" resultMap="BaseResultMap">
         SELECT *
         FROM sys_dict_data