fix: 修改登录,解决根据公司登录显示冻结问题

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java

@@ -432,9 +432,9 @@ public class UserTokenServiceImpl implements UserTokenService {
      */
     @Override
     public boolean getTenantStatus(String agentcode){
-        LambdaQueryWrapper<Tenant> tenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<Department> tenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        tenantLambdaQueryWrapper.eq(Tenant::getOtherno,agentcode);
+        tenantLambdaQueryWrapper.eq(Department::getDescription,agentcode);
-        Tenant tenant = tenantService.getOne(tenantLambdaQueryWrapper);
+        Department department = departmentService.getOne(tenantLambdaQueryWrapper);
-        return tenant != null && tenant.getStatus() == 0;
+        return department != null && department.getEnabled() == 1;
     }
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java

@@ -3,6 +3,7 @@ package cn.jyjz.xiaoyao.ocr.controller;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.jyjz.xiaoyao.common.base.util.StringUtils;
 import cn.jyjz.xiaoyao.ocr.api.PrevailCloudApi;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceParameter;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult;
@@ -48,6 +49,16 @@ public class ApiTestController {
         String endStr = request.getParameter("endStr");
         String pageSize = request.getParameter("pageSize");
         String pageNo = request.getParameter("pageNo");
+        String tenantNoStr = request.getParameter("tenantNo");
+        if(StringUtils.isBlank(tenantNoStr)){
+            return "租户不能为空";
+        }
+        String accountNoStr = request.getParameter("accountNo");
+        if(StringUtils.isBlank(accountNoStr)){
+            return "业务主体不能为空";
+        }
+        Long tenantNo = Long.parseLong(request.getParameter("tenantNo"));
+        Long accountNo = Long.parseLong(request.getParameter("accountNo"));
 
         PictureSourceParameter pictureSourceParameter = new PictureSourceParameter();
         DateTime dateTime = DateUtil.parse(beginStr+" 00:00:00","yyyy-MM-dd HH:mm:ss");
@@ -60,8 +71,8 @@ public class ApiTestController {
         pictureSourceParameter.setEndTime(Date.from(einstant));
         pictureSourceParameter.setPageNo(Integer.parseInt(pageNo));
         pictureSourceParameter.setPageSize(Integer.parseInt(pageSize));
-        pictureSourceParameter.setTenantNo(1714548920583360512L);
+        pictureSourceParameter.setTenantNo(tenantNo);
-        pictureSourceParameter.setAccountNo(1714887674875514880L);
+        pictureSourceParameter.setAccountNo(accountNo);
         try {
             ApiPage<PictureSourceResult> apiPage  =  prevailCloudApi.pullPictureSource(pictureSourceParameter);
             List<PictureSourceResult> listResult= apiPage.getRecords();