Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java

@@ -102,7 +102,9 @@ public class UserAccountServiceImpl implements UserAccountService {
 
     @Override
     public void insertUserAccount(UserAccountDO userAccountDO) {
-        userServiceDao.insertUserAccount(userAccountDO);
+        if(userServiceDao.getUserAccountInfoByUnionId(userAccountDO.getUnionId()) == null){
+            userServiceDao.insertUserAccount(userAccountDO);
+        }
     }
 
     @Override

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/userpoints/impl/UserPointsServiceImpl.java

@@ -129,6 +129,7 @@ public class UserPointsServiceImpl implements UserPointsService {
         }
         UserPointsDO userPointsDO = userPointsDao.selectUserPoints(userId);
         if (userPointsDO == null) {
+            userPointsDO = new UserPointsDO();
             userPointsDO.setUserAccountId(userId);
             userPointsDO.setTotalPoints(0);
             userPointsDao.insertPoints(userPointsDO);

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

@@ -579,10 +579,10 @@
                 district_child_id=#{districtChildId},
             </if>
             <if test="briefIntroduction!='' and briefIntroduction!=null">
-                brief_introduction=#{briefIntroduction},
+                brief_introduction=#{briefIntroduction}
             </if>
         </set>
-        where id=#{id}
+        where id=#{id} and is_deleted = 0
     </update>
 
     <select id="selectUserAccount" resultType="java.lang.Integer"

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 008c6998be2f74b11f35c08e3e30fbcb48408d60
+  newTag: 37919562896a7efde10fb36125f3e9357bea6828