数据看板bug修复

csm-service/cms-service-user/src/main/resources/mapper/UserServiceDao.xml

@@ -505,6 +505,7 @@
         select count(*)
         from user_account
         where disable = 0
+          and port_type = 100
     </select>
     <select id="getYesterdayAddUserCount" resultType="java.lang.Integer">
         SELECT count(*)
@@ -519,15 +520,23 @@
     </select>
 
     <select id="countPhoneNum" resultType="java.lang.Integer">
-        select count(*) from user_account where phone_num = #{phoneNum} and `disable`=0 and account_status=1
+        select count(*)
+        from user_account
+        where phone_num = #{phoneNum}
+          and `disable` = 0
+          and account_status = 1
     </select>
 
     <select id="countPhoneNums" resultType="java.lang.Integer">
-        select count(*) from user_account where phone_num = #{phoneNum}
-                                            and `disable`=0 and account_status=1 and id=#{userAccountId}
+        select count(*)
+        from user_account
+        where phone_num = #{phoneNum}
+          and `disable` = 0
+          and account_status = 1
+          and id = #{userAccountId}
     </select>
 
-    <select id="updateAccountPhone" >
+    <select id="updateAccountPhone">
         update user_account
         <set>
             phone_num = #{phoneNum}
@@ -559,22 +568,27 @@
 
     <select id="selectUserAccount" resultType="java.lang.Integer"
             parameterType="com.mmc.iuav.user.model.qo.UserMessageQO">
-        select count(*) from user_account where  disable=0 and nick_name=#{nickName} and id!=#{id}
+        select count(*)
+        from user_account
+        where disable = 0
+          and nick_name = #{nickName}
+          and id!=#{id}
     </select>
 
     <select id="selectUserAccountNickName" resultType="java.lang.Integer"
             parameterType="com.mmc.iuav.user.entity.UserAccountDO">
-        select count(*) from user_account where  disable=0 and nick_name=#{nickName} and id!=#{id}
+        select count(*)
+        from user_account
+        where disable = 0
+          and nick_name = #{nickName}
+          and id!=#{id}
     </select>
 
     <select id="getDistrictChild" resultType="java.lang.String">
-        SELECT
-            concat( p1.`name`, p2.`name` ) AS region
-        FROM
-            sys_district p1,
-            sys_district p2
-        WHERE
-            p2.LEVEL != 3
+        SELECT concat(p1.`name`, p2.`name`) AS region
+        FROM sys_district p1,
+             sys_district p2
+        WHERE p2.LEVEL != 3
 	AND p1.id = p2.pid
 	AND p2.id = #{districtChildId}
     </select>

csm-service/cms-service-user/src/main/resources/mapper/dronepilot/PilotCertificationDao.xml

@@ -361,8 +361,10 @@
         where id = #{id}
     </select>
     <select id="getDronePilotCount" resultType="java.lang.Integer">
-        select count(*)
-        from pilot_certification
-        where audit_status = 1
+        SELECT count(*)
+        FROM pilot_certification pc
+                 LEFT JOIN user_account ua ON pc.user_account_id = ua.id
+        WHERE pc.audit_status = 1
+          AND ua.`disable` = 0
     </select>
 </mapper>