修改淮安站现场bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.util.StringUtil;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
@@ -243,7 +244,8 @@ public class OrgUsrController extends BaseController {
 		LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(OrgUsr::getCode, code);
 		OrgUsr orgUsr = iOrgUsrService.getBaseMapper().selectOne(queryWrapper);
-		return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyById(orgUsr.getSequenceNbr()));
+		OrgUsrDto dto = iOrgUsrService.getCompanyByBizOrgCodeList(orgUsr.getBizOrgCode());
+		return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyById(dto.getSequenceNbr()));
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrganizationController.java

@@ -9,12 +9,15 @@ import com.alibaba.excel.read.metadata.ReadSheet;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.util.StringUtil;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrganizationExportDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrganizationUserExportDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Organization;
@@ -30,6 +33,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -55,6 +59,9 @@ public class OrganizationController extends BaseController {
     private OrganizationService organizationService;
 
     @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
+
+    @Autowired
     private static String UTF8 = "UTF-8";
     private static String CONTENTDISPOSITION = "Content-Disposition";
 
@@ -258,8 +265,10 @@ public class OrganizationController extends BaseController {
     @GetMapping(value = "/online/date")
     @PersonIdentify
     public ResponseModel<Map<String, Object>> getSystemOnlineDate(){
-        ReginParams reginParams =getSelectedOrgInfo();
-        String companyId = reginParams.getPersonIdentity().getCompanyId();
-        return ResponseHelper.buildResponse(organizationService.getSystemOnlineDate(companyId));
+        ReginParams reginParams = getSelectedOrgInfo();
+        String bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : "";
+        OrgUsrDto dto = iOrgUsrService.getCompanyByBizOrgCodeList(bizOrgCode);
+//        String companyId = reginParams.getPersonIdentity().getCompanyId();
+        return ResponseHelper.buildResponse(organizationService.getSystemOnlineDate(String.valueOf(dto.getSequenceNbr())));
     }
 }