Merge branch 'dev' of licailing/wenlvju into master

src/main/h5/src/components/previewRate.vue

@@ -16,7 +16,12 @@
       </div>
 
       <div class="submit">
-        <van-button @click="submit" :color="$colors.prim" block round
+        <van-button
+          @click="submit"
+          :color="$colors.prim"
+          block
+          round
+          :loading="saving"
           >确认提交</van-button
         >
       </div>
@@ -39,6 +44,10 @@ export default {
       default: () => {
         return {};
       }
+    },
+    saving: {
+      type: Boolean,
+      default: false
     }
   },
   components: { rateInfo },

src/main/h5/src/views/expert/expertAdd.vue

@@ -117,6 +117,7 @@
       @submit="submit"
       :info="subJson"
       :rate="form"
+      :loading="saving"
     ></preview-rate>
   </div>
 </template>
@@ -142,7 +143,8 @@ export default {
         imgs: []
       },
       img: [],
-      submitList: {}
+      submitList: {},
+      saving: false
     };
   },
   computed: {
@@ -280,6 +282,7 @@ export default {
         });
     },
     submit() {
+      this.saving = true;
       let form = { ...this.form };
       this.$toast.loading({
         message: "加载中...",

src/main/java/com/izouma/wenlvju/repo/UserRepo.java

@@ -25,4 +25,7 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
     User findByPhoneAndDelFalse(String phone);
 
     List<User> findAllByDistrictAndAuthoritiesContainsAndDelFalse(String district, Authority authorities);
+
+    User findByPhoneAndDelFalseAndIdIsNot(String phone, Long id);
+
 }

src/main/java/com/izouma/wenlvju/service/RateService.java

@@ -121,11 +121,18 @@ public class RateService {
     /*
     线下退回
      */
-    public void offline(Long id) {
+    public void offline(Long id, Long userId) {
         Rate rate = rateRepo.findById(id).orElseThrow(new BusinessException("无记录"));
         rate.setStatus(RateStatus.REVIEW_PENDING);
         rate.setSort(rate.getStatus().getSort());
         rateRepo.save(rate);
+        RateAudit rateAudit = RateAudit.builder()
+                .userId(userId)
+                .rateId(id)
+                .remark("线下考察材料提交不全，被退回！")
+                .status(RateStatus.REVIEW_PENDING)
+                .build();
+        rateAuditRepo.save(rateAudit);
     }
 
     public void audit(Long id, RateStatus status, String remark, Long userId) {

src/main/java/com/izouma/wenlvju/web/RateController.java

@@ -120,9 +120,10 @@ public class RateController extends BaseController {
         rateService.audit(id, status, remark, SecurityUtils.getAuthenticatedUser().getId());
     }
 
+    @OperLog(value = "等级评定", type = "退回", desc = "对等级评定申请进行操作")
     @PostMapping("/offline")
     public void offline(@RequestParam Long id) {
-        rateService.offline(id);
+        rateService.offline(id, SecurityUtils.getAuthenticatedUser().getId());
     }
 
 

src/main/java/com/izouma/wenlvju/web/UserController.java

@@ -1,6 +1,7 @@
 package com.izouma.wenlvju.web;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.izouma.wenlvju.domain.User;
 import com.izouma.wenlvju.dto.ExpertDTO;
 import com.izouma.wenlvju.dto.OrganizationRegDTO;
@@ -69,15 +70,13 @@ public class UserController extends BaseController {
     public User save(@RequestBody User user) {
         if (user.getId() != null) {
             User orig = userRepo.findById(user.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, user);
-            if (ObjectUtil.isNotNull(orig.getPhone())) {
-                User byPhone = userRepo.findByPhoneAndDelFalse(orig.getPhone());
+            if (StrUtil.isNotEmpty(user.getPhone())) {
+                User byPhone = userRepo.findByPhoneAndDelFalseAndIdIsNot(user.getPhone(), user.getId());
                 if (ObjectUtil.isNotNull(byPhone)) {
-                    if (!byPhone.getId().equals(user.getId())) {
-                        throw new BusinessException("该手机号已绑定");
-                    }
+                    throw new BusinessException("该手机号已绑定");
                 }
             }
+            ObjUtils.merge(orig, user);
             return userRepo.save(orig);
         }
         return userRepo.save(user);