查询用户列表添加用户角色的显示

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/entity/UserInfoResp.java

@@ -35,8 +35,8 @@ public class UserInfoResp implements Serializable {
     @ApiModelProperty(value = "供应商")
     private String factoryName;
 
-    @ApiModelProperty(value = "角色code")
-    private String roleCode;
+    @ApiModelProperty(value = "角色")
+    private String roleName;
 
     @ApiModelProperty(value = "是否启用")
     private Integer isEnable;

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserInfoMapper.xml

@@ -50,7 +50,7 @@
         <if test="req.employeeNo != null and req.employeeNo != ''">
             AND u.EMPLOYEE_NO LIKE CONCAT('%',#{req.employeeNo},'%')
         </if>
-        <if test="req.roleCode != null">
+        <if test="req.roleCode != null and req.roleCode != ''">
             AND r.role_code = #{req.roleCode}
         </if>
         <if test="req.isEnable != null">