Merge branch 'dev' of http://146.56.199.25:3000/zhuibobo/EnforcementCode-2.0 into dev

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zdxt.enforcementcode.common.annotation.DataScope;
 import com.zdxt.enforcementcode.common.commonenum.PlatformTypeEnums;
+import com.zdxt.enforcementcode.common.util.CommonUtil;
 import com.zdxt.enforcementcode.common.util.IdCardCryptoUtil;
 import com.zdxt.enforcementcode.domain.*;
 import com.zdxt.enforcementcode.domain.bo.DashboardEnterpriseCheckQueryBo;
@@ -269,7 +270,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 try {
                     SysUser user = userMap.get(Convert.toLong(vo.getLawEnforcerId()));
                     if (user != null) {
-                        vo.setLawEnforcerDisplay(formatEnforcerDisplay(user));
+                        vo.setLawEnforcer(formatEnforcerDisplay(user));
                     }
                 } catch (Exception ignored) {}
             }
@@ -302,10 +303,10 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         }
         // 无执法证号时展示脱敏手机号
         String phone = user.getPhonenumber();
-        if (StringUtils.isNotBlank(phone) && phone.length() >= 7) {
+        /*if (StringUtils.isNotBlank(phone) && phone.length() >= 7) {
             phone = phone.substring(0, 3) + "****" + phone.substring(phone.length() - 4);
-        }
-        return user.getUserName() + " " + (phone != null ? phone : "");
+        }*/
+        return user.getUserName() + " " + CommonUtil.encryptPhone(phone);
     }
 
     /**
@@ -501,7 +502,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 try {
                     SysUser user = userMap.get(Convert.toLong(vo.getLawEnforcerId()));
                     if (user != null) {
-                        vo.setLawEnforcerDisplay(formatEnforcerDisplay(user));
+                        vo.setLawEnforcer(formatEnforcerDisplay(user));
                     }
                 } catch (Exception ignored) {}
             }
@@ -589,7 +590,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 try {
                     SysUser user = userMap.get(Convert.toLong(registrationVo.getLawEnforcerId()));
                     if (user != null) {
-                        infoVo.setLawEnforcerDisplay(formatEnforcerDisplay(user));
+                        infoVo.setLawEnforcer(formatEnforcerDisplay(user));
                     }
                 } catch (Exception ignored) {}
             }

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseInformationMapper.xml

@@ -64,33 +64,27 @@
         LIMIT 20
     </select>
 
-
     <select id="selectEnterpriseInformationAndQrInfoPage" resultType="com.zdxt.enforcementcode.domain.vo.EnterpriseInformationVo">
         SELECT
-            ei.*,gh.qr_code_url
-        FROM
-            enterprise_information ei
-        LEFT JOIN (
-            SELECT
-                t.enterprise_number,
-                ANY_VALUE(t.qr_code_url) AS qr_code_url
-            FROM
-                ( SELECT enterprise_number,
-                        qr_code_url,
-                        generate_time
-                        FROM qr_code_generate_history
-                    WHERE `status` = 0 ORDER BY generate_time DESC) t
-         GROUP BY
-            t.enterprise_number,t.qr_code_url,t.generate_time
-            ) gh ON ei.enterprise_number = gh.enterprise_number
+        ei.*,
+        gh.qr_code_url
+        FROM enterprise_information ei
+        LEFT JOIN qr_code_generate_history gh
+        ON ei.enterprise_number = gh.enterprise_number
+        AND gh.status = 0
+        AND gh.generate_time = (
+        SELECT MAX(sub.generate_time)
+        FROM qr_code_generate_history sub
+        WHERE sub.enterprise_number = ei.enterprise_number
+        AND sub.status = 0
+        )
         <where>
-            and ei.is_delete = 0
+            AND ei.is_delete = 0
             <if test="bo.searchValue != null and bo.searchValue != ''">
-                AND (ei.enterprise_name like concat('%', #{bo.searchValue}, '%')
-                or ei.enterprise_number like concat('%', #{bo.searchValue}, '%'))
+                AND (ei.enterprise_name like concat('%', #{bo.searchValue}, '%') OR ei.enterprise_number like concat('%', #{bo.searchValue}, '%'))
             </if>
-            <if test="bo.enterpriseName != null and bo.enterpriseName != ''">
-                and ei.enterprise_name like concat('%', #{bo.enterpriseName}, '%')
+            <if test="bo.enterpriseName != null  and bo.enterpriseName != ''">
+                AND ei.enterprise_name like concat('%', #{bo.enterpriseName}, '%')
             </if>
         </where>
         ORDER BY ei.create_time DESC

zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -205,7 +205,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public List<SysUserVo> selectUserByIds(List<Long> userIds, Long deptId) {
         return baseMapper.selectUserList(new LambdaQueryWrapper<SysUser>()
-            .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName)
+            .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName,SysUser::getLawCertificateNum,SysUser::getPhonenumber)
             .eq(SysUser::getStatus, SystemConstants.NORMAL)
             .eq(ObjectUtil.isNotNull(deptId), SysUser::getDeptId, deptId)
             .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds));