代码规范

commons/src/main/java/com/jzg/commons/core/base/BaseController.java

@@ -115,6 +115,7 @@ public class BaseController {
 
         List<String> userPerms = new ArrayList<>();
         String userJsonStr = redissonClient.getBucket(authorizationHeader).get().toString();
+        log.info("获取平台权限：authorizationHeader=[{}]，userJsonStr=[{}]",authorizationHeader, userJsonStr);
         JSONObject userInfo = JSONObject.parseObject(userJsonStr);
         JSONArray auths = userInfo.getJSONArray("auths");
         auths.forEach(auth->{

platform/src/main/java/com/jzg/controller/UserRoleController.java

@@ -1,5 +1,6 @@
 package com.jzg.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.constants.OperationTypeEnum;
@@ -14,6 +15,8 @@ import com.jzg.mapper.SysRoleMapper;
 import com.jzg.service.UserRoleService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -28,6 +31,8 @@ import java.util.Objects;
 @RequestMapping("/userRole")
 public class UserRoleController extends BaseController {
 
+    private static final Logger log = LoggerFactory.getLogger(UserRoleController.class);
+
     @Autowired
     UserRoleService userRoleService;
 
@@ -67,7 +72,8 @@ public class UserRoleController extends BaseController {
     @OperatorTrajectory(moduleName = "组织架构/角色管理/修改角色",OperationDict = OperationTypeEnum.UPDATE, mapperClass = SysRoleMapper.class,type = "U",entityClass = SysRoleVo.class )
     @Operation(summary = "角色修改")
     @PostMapping("/roleUpdate")
-    public HttpResult roleUpdate(@Validated @RequestBody SysRoleVo sysRoleVo){
+    public HttpResult<String> roleUpdate(@Validated @RequestBody SysRoleVo sysRoleVo){
+        log.info("修改角色信息：sysRoleVo=[{}]", JSONUtil.toJsonStr(sysRoleVo));
         //如果不是平台则校验数据权限
         if(!getUserSystemCode().equals(SystemConstants.SYSTEM_PLATFORM.getCode())){
             //从用户信息中获取租户code
@@ -78,6 +84,7 @@ public class UserRoleController extends BaseController {
             }
         }
         if(userRoleService.isExist(sysRoleVo.getName(),sysRoleVo.getId())){
+            log.info("角色名称已存在，请修改后重新提交。sysRoleVo.getName()=[{}],sysRoleVo.getId()=[{}]",sysRoleVo.getName(),sysRoleVo.getId());
             throw new ValidateException("角色名称已存在,请修改后重新提交");
         }
         return userRoleService.roleUpdate(sysRoleVo)? HttpResult.ok("修改角色成功") : HttpResult.error("修改角色失败");

platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.annotation.IgnoreTenant;
@@ -142,6 +143,8 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
     @Transactional
     @Override
     public boolean roleUpdate(SysRoleVo sysRoleVo) {
+        String systemCOde = baseController.getUserSystemCode();
+        log.info("修改角色信息：sysRoleVo=[{}],systemCode=[{}]", JSONUtil.toJsonStr(sysRoleVo),systemCOde);
         SysRole sysRole = sysRoleVo.getSysRole();
         List<SysRolePerms> sysRolePermsList = new ArrayList<>();
         sysRoleVo.getPerms().forEach(item->{
@@ -161,7 +164,6 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
                .eq(SysRoleDataScope::getRoleId,sysRole.getId()));
         sysRoleDataScopeLinkMapper.delete(new LambdaQueryWrapper<SysRoleDataScopeLink>()
               .eq(SysRoleDataScopeLink::getRoleId,sysRole.getId()));
-
         //保存角色数据权限  如果是平台则直接跳过
         if(!baseController.getUserSystemCode().equals(SystemConstants.SYSTEM_PLATFORM.getCode())) {
             SysRoleDataScope sysRoleDataScope = new SysRoleDataScope();

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -403,7 +403,8 @@ public class UnifyOrderManager {
         }
 
         SysUserActivityCompleteInRule record = new SysUserActivityCompleteInRule();
-        record.setTenantId(tenantId);
+        // 项目启动报错，先注释掉
+        //record.setTenantId(tenantId);
         record.setUserId(userId);
         record.setUserPhone(userPhone);
         record.setActivityType(activityType);

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -235,7 +235,7 @@ public class ReceivableController {
 
     @PostMapping("/invoiceRecord")
     @Operation(summary = "获取开票记录")
-    public HttpResult getInvoiceRecord(@RequestBody InvoiceRecordQueryVo invoiceRecordQueryVo){
+    public HttpResult<Page<InvoiceRecordResult>> getInvoiceRecord(@RequestBody InvoiceRecordQueryVo invoiceRecordQueryVo){
         return HttpResult.ok(receivableService.getInvoiceRecordList(invoiceRecordQueryVo));
     }
 //    @PostMapping("batchModify")