1.修改导出的资金模板

2.修改个代和渠道人员查询

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -351,14 +351,14 @@ public class SysUserController extends BaseController {
     @PostMapping(value = "/findUserList")
     public HttpResult findUserList(@RequestBody PageDto<SysUserDto> pageDto) {
         //获取用户角色
-        SysUser user = getUser();
-        if (RoleConstants.R22.getCode().equals(pageDto.getDto().getRoleId())) {
-            pageDto.getDto().setRoleId("17,18,22,23,24,25,28,29,30,31,32,38");
-        }
+        BaseController baseController = new BaseController();
+//        if (RoleConstants.R22.getCode().equals(pageDto.getDto().getRoleId())) {
+//            pageDto.getDto().setRoleId("17,18,22,23,24,25,28,29,30,31,32,38");
+//        }
         //设置登录用户的部门
-        if ("".equals(pageDto.getDto().getDeptId()) || null == pageDto.getDto().getDeptId()) {
-            pageDto.getDto().setDeptId(user.getDeptId());
-        }
+//        if ("".equals(pageDto.getDto().getDeptId()) || null == pageDto.getDto().getDeptId()) {
+//            pageDto.getDto().setDeptId(baseController.getDeptId());
+//        }
 
         return HttpResult.ok(sysUserService.findUserList(pageDto));
     }

src/main/java/com/ydtech/modules/inv/utils/EasyExcelUtils.java

@@ -273,7 +273,7 @@ public class EasyExcelUtils {
 
             for (Map.Entry<String, Object> entry : excel.getOutProfit().entrySet()) {
                 if (Integer.parseInt(entry.getValue().toString()) != 0) {
-                    stringBuffer.append(collect.get(entry.getKey()).get(0).getProfitName()).append("    ").append(entry.getValue()).append("%");
+                    stringBuffer.append(collect.get(entry.getKey()).get(0).getProfitName()).append("    ").append(entry.getValue());
                 }
             }
 
@@ -281,7 +281,7 @@ public class EasyExcelUtils {
 
             for (Map.Entry<String, Object> entry : excel.getEntProfit().entrySet()) {
                 if (Integer.parseInt(entry.getValue().toString()) != 0) {
-                    stringBuffer.append(collect.get(entry.getKey()).get(0).getProfitName()).append("   ").append(entry.getValue()).append("%");
+                    stringBuffer.append(collect.get(entry.getKey()).get(0).getProfitName()).append("   ").append(entry.getValue());
                 }
             }
 

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -120,7 +120,7 @@
 
 
     <select id="findUserList" resultType="com.ydtech.modules.admin.model.vo.SysUserBaseVO">
-        select
+        SELECT
         su.id as userId,
         su.name,
         info.sex,
@@ -128,19 +128,21 @@
         su.status,
         sd.id as deptId,
         sd.name as deptName,
-        psd.id as pDeptId,
-        psd.name as pDeptName,
         t4.id as roleId,
-        t4.name as roleName
-        from sys_user su
-        left join sys_dept sd on su.dept_id=sd.id
-        left join sys_dept psd on sd.parent_id=psd.id
-        left join sys_user_info info on info.id=su.id
-        left join sys_user_role t3 on su.id=t3.user_id
-        left join sys_role t4 on t3.role_id=t4.id
-        where 1=1
-        AND sd.id &lt;&gt; ''
-        and psd.comlevel = '5'
+        t4.name as roleName,
+        sd.management_source,
+        psd.id as pDeptId,
+        psd.name as pDeptName
+        FROM
+        sys_user su
+        LEFT JOIN sys_user_info info ON info.id = su.id
+        LEFT JOIN sys_dept sd ON su.dept_id = sd.id
+        left join sys_dept psd on psd.id = sd.parent_id
+        LEFT JOIN sys_user_role t3 ON su.id = t3.user_id
+        LEFT JOIN sys_role t4 ON t3.role_id = t4.id
+        AND sd.del_flag = '0'
+        WHERE
+        1=1
         <if test='user !=null  '>
             <if test='user.status !=null and user.status!="" '>
                 and su.status = #{user.status}
@@ -161,7 +163,7 @@
                 and t3.role_id in (${user.roleId})
             </if>
             <if test="user.agentFlag !=null and user.agentFlag!='' ">
-                and psd.management_source = #{user.agentFlag}
+                and sd.management_source = #{user.agentFlag}
             </if>
         </if>
     </select>