Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.base.Strings;
 import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
@@ -108,8 +109,12 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
         UserDetail userDetail = SecurityUtil.loginUser();
         Long userId = userDetail.getUserId();
         String bizObjValue = userDetail.getBizObj();
-        BizObj bizObj = BizObj.valueOf(bizObjValue);
         BizCompanyEntity bizCompanyEntity;
+        if (Strings.isNullOrEmpty(bizObjValue)) {
+            bizCompanyEntity = this.getById(id);
+            return BeanUtil.copyProperties(bizCompanyEntity, SearchCompanyResult.class);
+        }
+        BizObj bizObj = BizObj.valueOf(bizObjValue);
         switch (bizObj) {
             case ShiGongDanWei:
             case QingYunGongSi:

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyAccountController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * 资金账户表
+ * 资金管理
  */
 @Slf4j
 @RestController

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyChangeDetailController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * 资金变动明细
+ * 资金明细
  */
 @Slf4j
 @RestController