账单部分调整

src/main/java/com/winhc/repal/aspect/ControllerAspect.java

@@ -92,13 +92,13 @@ public class ControllerAspect {
                 // 获取注解的值
                 String userKey = Constant.USER_PERMISSION_KEY + UserContextUtil.getUser().getUserId();
                 if (redisUtil.hasKey(userKey)) {
-                    if (!redisUtil.sIsMember(userKey, ((RolePermission)a).permission())) {
-                        LOGGER.error("user permission error, ======>>>>>>userId:[{}], ======>>>>>>permissionCode:[{}]", UserContextUtil.getUser().getUserId(), ((RolePermission)a).permission());
+                    if (!redisUtil.sIsMember(userKey, ((RolePermission)a).permission().getCode())) {
+                        LOGGER.error("user permission error, ======>>>>>>userId:[{}], ======>>>>>>permissionCode:[{}]", UserContextUtil.getUser().getUserId(), ((RolePermission)a).permission().getCode());
                         throw new CommonException(CodeMsg.FAILED, "没有相关权限");
                     }
                 } else {
                     if (!repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(), ((RolePermission)a).permission().getCode())) {
-                        LOGGER.error("user permission error, ======>>>>>>userId:[{}], ======>>>>>>permissionCode:[{}]", UserContextUtil.getUser().getUserId(), ((RolePermission)a).permission());
+                        LOGGER.error("user permission error, ======>>>>>>userId:[{}], ======>>>>>>permissionCode:[{}]", UserContextUtil.getUser().getUserId(), ((RolePermission)a).permission().getCode());
                         throw new CommonException(CodeMsg.FAILED, "没有相关权限");
                     }
                 }

src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -481,14 +481,16 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
             repalBillDiagnosisService.addRepalBillDiagnosis(repalBill.getUserId(), repalBill.getId(), dto.getTotalMoney(), Collections.singletonList(customer.getCustName()));
         }
         // 负责人
-        repalResponsiblePersonService.saveBatch(dto.getResponsiblePersonIdList().stream().map(t -> {
-            RepalResponsiblePerson person = new RepalResponsiblePerson();
-            person.setRepalGroupId(groupId);
-            person.setRepalBookId(dto.getRepalBookId());
-            person.setRepalBillId(repalBill.getId());
-            person.setUserId(t);
-            return person;
-        }).collect(Collectors.toList()));
+        if (CollUtil.isNotEmpty(dto.getResponsiblePersonIdList())) {
+            repalResponsiblePersonService.saveBatch(dto.getResponsiblePersonIdList().stream().map(t -> {
+                RepalResponsiblePerson person = new RepalResponsiblePerson();
+                person.setRepalGroupId(groupId);
+                person.setRepalBookId(dto.getRepalBookId());
+                person.setRepalBillId(repalBill.getId());
+                person.setUserId(t);
+                return person;
+            }).collect(Collectors.toList()));
+        }
         return true;
     }