add 增加roleIds字段

fix 查询用户信息时回显多个角色，部门

jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -14,6 +14,7 @@ import com.jero.modules.system.vo.SysUserVo;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import com.jero.common.api.vo.Result;
@@ -92,6 +93,9 @@ public class SysUserController {
     @Value("${jero.path.upload}")
     private String upLoadPath;
 
+    @Value("${defaultPassword}")
+    private String defaultPassword;
+
     @Resource
     private BaseCommonService baseCommonService;
 
@@ -548,6 +552,23 @@ public class SysUserController {
         return mv;
     }
 
+    /**
+     * 导出excel模板
+     */
+    @RequiresPermissions("defect:download:template")
+    @ApiOperation(value="用户-导出excel模板", notes="用户-导出excel模板")
+    @GetMapping(value = "/exportTemplate")
+    public ModelAndView exportTemplate() {
+        // AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.FILE_NAME, "用户导入模板文件");
+        mv.addObject(NormalExcelConstants.CLASS, SysUser.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("用户导入模板文件", "用户导入模板文件"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList<SysUser>());
+        return mv;
+    }
+
     /**
      * 通过excel导入数据
      *
@@ -567,7 +588,7 @@ public class SysUserController {
         for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
             MultipartFile file = entity.getValue();// 获取上传文件对象
             ImportParams params = new ImportParams();
-            params.setTitleRows(2);
+            params.setTitleRows(1);
             params.setHeadRows(1);
             params.setNeedSave(true);
             try {
@@ -575,8 +596,8 @@ public class SysUserController {
                 for (int i = 0; i < listSysUsers.size(); i++) {
                     SysUser sysUserExcel = listSysUsers.get(i);
                     if (StringUtils.isBlank(sysUserExcel.getPassword())) {
-                        // 密码默认为 “123456”
-                        sysUserExcel.setPassword("123456");
+                        // 存入默认密码
+                        sysUserExcel.setPassword(defaultPassword);
                     }
                     // 密码加密加盐
                     String salt = oConvertUtils.randomGen(8);

jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java

@@ -169,7 +169,6 @@ public class SysUser implements Serializable {
     /**
      * 身份（0 普通成员 1 上级）
      */
-    @Excel(name="（1普通成员 2上级）",width = 15)
     private Integer userIdentity;
 
     /**
@@ -179,6 +178,13 @@ public class SysUser implements Serializable {
     @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
     private String departIds;
 
+    /**
+     * 角色类型
+     */
+    @Excel(name="角色类型",width = 15,dictTable ="sys_role",dicText = "role_name",dicCode = "id")
+    @Dict(dictTable ="sys_role",dicText = "role_name",dicCode = "id")
+    private String roleIds;
+
     /**
      * 多租户id配置，编辑用户的时候设置
      */

jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml

@@ -164,7 +164,9 @@
 
 	<select id="queryPageListByRoleAndDepart" resultType="com.jero.modules.system.vo.SysUserVo">
 		select a.*
-		from (select su.*, group_concat(sur.role_id) roleIds, group_concat(sud.dep_id) departIds
+		from (select su.*,
+					group_concat(DISTINCT sur.role_id) roleIds,
+					group_concat(DISTINCT sud.dep_id) departIds
 			  from sys_user su
 						   left join sys_user_role sur on su.id = sur.user_id
 						   left join sys_user_depart sud ON su.id = sud.user_id