FIX merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -360,6 +360,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean updateAuditByEditBo(UserProfileEditBo bo,LoginUser loginUser) {
         UserProfile update = BeanUtil.toBean(bo,UserProfile.class);
         UserProfileVo userProfileVo1 = this.queryById(bo.getId());
@@ -375,20 +376,15 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         update.setAuditTime(DateUtils.getNowTime());
         update.setChangeStatus(1);
 
-        UserProfileVo userProfileVo = this.queryById(bo.getId());
-        //发送消息分为资料审核发送，和盖章审核发送 1资料 2盖章
-        if (userProfileVo.getTypeStatus().equals(1)){
-            //审核资料发送消息
-            sendAuidit(update);
-            if (update.getStatus().equals(1)) {
-                //审核通过同步身份证到用户信息
-                getUserPicInfo(update);
-            }
-
-        }else if (userProfileVo.getTypeStatus().equals(2)){
-            //审核承诺书发送消息
-            sendAuiditSMS(update);
+        //审核资料发送消息
+        sendAuidit(update);
+        if (update.getStatus().equals(1)) {
+            //审核通过同步身份证到用户信息
+            getUserPicInfo(update);
         }
+        //审核承诺书发送消息
+        sendAuiditSMS(update);
+
         return this.updateById(update);
     }