Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/mapper/xml/SysUserInfoMapper.xml

@@ -10,7 +10,7 @@
 			a.id_card,
 			a.mobile_phone,
 			(SELECT NAME FROM sys_office b WHERE b.id = a.department) AS department,
-			(SELECT NAME FROM sys_role c WHERE c.id = a.position) AS position,
+			(SELECT GROUP_CONCAT(name SEPARATOR ',' ) FROM sys_post WHERE INSTR(a.position, id)) AS position,
 			highest_education,
 			(SELECT e.label FROM sys_dict_type d LEFT JOIN sys_dict_value e ON d.id = e.dict_type_id WHERE d.type = #{userStatus} AND e.`value` = a.user_type) AS user_status,
 			entry_date

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/user/service/UserInfoService.java

@@ -187,6 +187,7 @@ public class UserInfoService {
         BeanUtils.copyProperties(detailDto, sysUserInfo);
         String id = UUID.randomUUID().toString().replace("-", "");
         sysUserInfo.setId(id);
+        sysUserInfo.setJobNo(detailDto.getMobilePhone());
         sysUserInfo.setCreateBy(dto.getId());
         sysUserInfo.setCreateDate(new Date());
         sysUserInfo.setUpdateBy(dto.getId());
@@ -363,6 +364,7 @@ public class UserInfoService {
         UserDTO dto = UserUtils.getCurrentUserDTO();
         SysUserInfo sysUserInfo = new SysUserInfo();
         BeanUtils.copyProperties(detailDto, sysUserInfo);
+        sysUserInfo.setJobNo(detailDto.getMobilePhone());
         sysUserInfo.setUpdateBy(dto.getId());
         sysUserInfo.setUpdateDate(new Date());
         sysUserInfoMapper.updateById(sysUserInfo);