Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -717,8 +717,8 @@ public class FsUserServiceImpl implements IFsUserService {
             if (item.getPhone() != null) {
                 item.setPhone(ParseUtils.parsePhone(item.getPhone()));
             }
-            if (item.getStatus() != null) {
-                String userStatus = DictUtils.getDictLabel("user_status", String.valueOf(item.getStatus()));
+            if (item.getStatus() != null) {//project_user_status user_status
+                String userStatus = DictUtils.getDictLabel("project_user_status", String.valueOf(item.getStatus()));
                 if (StringUtils.isNotBlank(userStatus)) {
                     item.setStatusText(userStatus);
                 }

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -273,8 +273,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND fs_user_company_user.project_id = #{projectId}
         </if>
         <if test="keyword != null and keyword !='' ">
-            AND (fs_user.nick_name LIKE concat('%',#{keyword},'%')
-            or  fs_user.phone LIKE concat('%',#{keyword},'%')
+            AND (fs_user.nick_name   LIKE concat('%',#{keyword} COLLATE utf8mb4_unicode_ci,'%')
+            or  fs_user.phone  LIKE concat('%',#{keyword} COLLATE utf8mb4_unicode_ci,'%')
             )
         </if>
         <if test="registerStartTime != null and registerStartTime !='' ">
@@ -362,7 +362,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         fs_user.create_time,
         fs_user.remark,
         ucu.id,
-        ucu.status,
+        ucu.`status`,
         ucu.company_user_id,
         ucu.company_id,
         ucu.project_id,
@@ -376,6 +376,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">
                 AND fs_user.user_id = #{userId}
             </if>
+            <if test="status != null">
+                AND ucu.status = #{status}
+            </if>
             <if test="companyId != null">
                 AND ucu.company_id = #{companyId}
             </if>
@@ -780,7 +783,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and fs_user_company_user.company_id = #{companyId}
         </if>
         GROUP BY
-        fs_user_company_user.`status`
+        fs_user_company_user.`status`,fs_user_company_user.project_id
     </select>
 
     <select id="getRepeatUserNumber" resultType="int">