1

hjzx-api/src/main/java/api/controller/system/UserController.java

@@ -2,6 +2,7 @@ package api.controller.system;
 
 import api.entity.database.call.CallLog;
 import api.entity.database.system.*;
+import api.entity.input.system.UserInput;
 import api.entity.view.call.CallLogView;
 import api.entity.view.system.CustomerView;
 import api.entity.view.system.UserView;
@@ -46,8 +47,10 @@ public class UserController extends BaseController {
     @ApiOperation("列表")
     @Log(title = "查询用户信息表列表", businessType = BusinessType.QUERY)
     @GetMapping
-    public AjaxResult getList(User input, PageInput pageInput) {
+    @Anonymous
+    public AjaxResult getList(UserInput input, PageInput pageInput) {
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper();
+
         qw.eq(input.getUserId() != null && input.getUserId() > 0, User::getUserId, input.getUserId());
        // qw.eq(input.getDeptId() != null && input.getDeptId() > 0, User::getDeptId, input.getDeptId());
         if (input.getDeptId() != null &&input.getDeptId()>0)
@@ -60,6 +63,11 @@ public class UserController extends BaseController {
                 wq.or().eq(User::getDeptId,input.getDeptId());
             });
         }
+        //查询角色
+        if (input.getRoleId()!=null&&input.getRoleId()>0)
+        {
+            qw.inSql(User::getUserId, "select user_id from sys_user_role where role_id="+input.getRoleId());
+        }
         qw.like(!StringHelper.isEmpty(input.getUserName()), User::getUserName, input.getUserName());
         qw.like(!StringHelper.isEmpty(input.getNickName()), User::getNickName, input.getNickName());
         qw.eq(!StringHelper.isEmpty(input.getUserType()), User::getUserType, input.getUserType());

hjzx-entity/src/main/java/api/entity/input/system/UserInput.java

@@ -0,0 +1,11 @@
+package api.entity.input.system;
+
+import api.entity.database.system.User;
+import lombok.Data;
+
+@Data
+public class UserInput extends User {
+
+    //角色id
+    private Long roleId;
+}

hjzx-entity/src/main/java/api/entity/view/system/UserView.java

@@ -11,7 +11,7 @@ import java.util.List;
 public class UserView extends User {
     /** 部门 */
     private Dept dept;
-
+    private String roleName;
     /** 角色对象 */
     private List<Role> roles;
 
@@ -19,4 +19,6 @@ public class UserView extends User {
     private List<Long> roleIds;
 
     private String extension;
+
+
 }

hjzx-mapper/src/main/resources/mapper/report/ReportMapper.xml

@@ -285,8 +285,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="selectSatisfaction"  parameterType="Date" resultMap="SatisfactionViewResult">
 		select
-		count(myd=1 or null  )  basically,
-		count(myd=2 and is_answer=1 or null  )  satisfied,
+		count(myd=2 or null  )  basically,
+		count(myd=1 and is_answer=1 or null  )  satisfied,
 		count(myd=3 and is_answer=1 or null  )  dissatisfied
 		from rep_record
 		where  DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
@@ -397,8 +397,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		SUM(CASE WHEN call_type = 2 AND is_answer = 0 THEN 1 ELSE 0 END) AS outbound_not_connected,
 		SUM(CASE WHEN call_type = 1 AND is_answer = 1
 		THEN TIMESTAMPDIFF(SECOND, answer_time, hangup_time)  ELSE 0 END) call_duration,
-		count(myd=1 or null  )  basically,
-		count(myd=2 or null  )  satisfied,
+		count(myd=2 or null  )  basically,
+		count(myd=1 or null  )  satisfied,
 		count(myd=3  or null  )  dissatisfied
 		from rep_record
 		where 1=1

hjzx-mapper/src/main/resources/mapper/system/UserMapper.xml

@@ -23,6 +23,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="roleName" column="roleName"/>
         <association property="dept" column="dept_id" javaType="api.entity.database.system.Dept"
                      resultMap="deptResult"/>
     </resultMap>
@@ -83,31 +84,68 @@
     </sql>
 
     <sql id="selectUserDeptVo">
-select * from (
-        select u.user_id,
-               u.dept_id,
-               u.user_name,
-               u.nick_name,
-               u.email,
-               u.avatar,
-               u.phonenumber,
-               u.password,
-               u.sex,
-               u.status,
-               u.del_flag,
-               u.login_ip,
-               u.login_date,
-               u.create_by,
-               u.create_time,
-               u.remark,
-               d.parent_id,
-               d.ancestors,
-               d.dept_name,
-               d.order_num,
-               d.leader,
-               d.status as dept_status
-        from sys_user u
-        left join sys_dept d on u.dept_id = d.dept_id) as u
+        SELECT *from (
+        SELECT
+        u.user_id,
+        u.dept_id,
+        u.user_name,
+        u.nick_name,
+        u.email,
+        u.avatar,
+        u.phonenumber,
+        u.password,
+        u.sex,
+        u.status,
+        u.del_flag,
+        u.login_ip,
+        u.login_date,
+        u.create_by,
+        u.create_time,
+        u.remark,
+        u.parent_id,
+        u.ancestors,
+        u.dept_name,
+        u.order_num,
+        u.leader,
+        u.dept_status,
+        COALESCE(GROUP_CONCAT(DISTINCT r.role_name ORDER BY r.role_name SEPARATOR ','), '') AS roleName
+        FROM (
+        SELECT
+        su.*,
+        d.parent_id,
+        d.ancestors,
+        d.dept_name,
+        d.order_num,
+        d.leader,
+        d.status AS dept_status
+        FROM sys_user su
+        LEFT JOIN sys_dept d ON su.dept_id = d.dept_id
+        ) AS u
+        LEFT JOIN sys_user_role ur ON ur.user_id = u.user_id
+        LEFT JOIN sys_role r ON ur.role_id = r.role_id
+        GROUP BY
+        u.user_id,
+        u.dept_id,
+        u.user_name,
+        u.nick_name,
+        u.email,
+        u.avatar,
+        u.phonenumber,
+        u.password,
+        u.sex,
+        u.status,
+        u.del_flag,
+        u.login_ip,
+        u.login_date,
+        u.create_by,
+        u.create_time,
+        u.remark,
+        u.parent_id,
+        u.ancestors,
+        u.dept_name,
+        u.order_num,
+        u.leader,
+        u.dept_status) as u
     </sql>
 
     <select id="selectUserDeptList" resultMap="SysUserResult" >