Merge branch 'bugfix-0822' into develop

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

@@ -278,7 +278,7 @@
             AND rna.check_status = #{realAuthStatus}
         </if>
         <if test="realAuthStatus == 0">
-            AND ( rna.check_status is not null or rna.check_status = 0 )
+            AND ( rna.check_status is null or rna.check_status = 0 )
         </if>
         <if test="startTime != null ">
             AND ua.create_time >= #{startTime}
@@ -349,7 +349,7 @@
             AND rna.check_status = #{realAuthStatus}
         </if>
         <if test="realAuthStatus == 0">
-            AND ( rna.check_status is not null or rna.check_status = 0 )
+            AND ( rna.check_status is null or rna.check_status = 0 )
         </if>
         <if test="startTime != null ">
             AND ua.create_time >= #{startTime}

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: d38385144aaeecfff8c147e07aac460ea1f01b43
+  newTag: 1ab13d69651c5b403ab777b73c8ad72ec5831057