Merge remote-tracking branch 'origin/master'

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -706,8 +706,8 @@ public class TaskController extends BladeController {
                                     dto.setProjectAndUserList(list);
                                     //单个保存专家信息
                                     R<Boolean> booleanR = userClient.saveUserDTO(dto);
-                                    if (booleanR.getData() == null ||  booleanR.getData() != true){
-                                        throw new ServiceException("保存专家账号失败");
+                                    if (booleanR.getData() == null ||  booleanR.isSuccess() != true){
+                                        throw new ServiceException(booleanR.getMsg());
                                     }
                                 }
                                 //修改档案类型
@@ -715,7 +715,7 @@ public class TaskController extends BladeController {
                                 if (StringUtils.isNotBlank(archiveIds)){
                                     List<Long> longs = Func.toLongList(archiveIds);
                                     R<Boolean> booleanR = archiveClient.batchUpdateIsApply(1, longs);
-                                    if (booleanR.getData() == null || booleanR.getData() != true){
+                                    if (booleanR.getData() == null || booleanR.isSuccess() != true){
                                         throw new ServiceException("修改档案类型失败");
                                     }
                                 }

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -132,7 +132,11 @@ public class UserClient implements IUserClient {
 
     @Override
     public R<Boolean> saveUserDTO(UserDTO user) {
-        service.submit2(user);
+        try {
+            service.submit2(user);
+        }catch (Exception e){
+            return R.data(false);
+        }
         return R.data(true);
     }