From 34d9307df9870510f9204659ddf9f5389012cd4d Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 17 Jun 2024 15:57:37 +0800
Subject: [PATCH] fix：sql查询时间调整
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 6dd4799..77f3892 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -23,6 +23,7 @@
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.ext.allocation.AllocationListExt;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
+import com.moral.api.pojo.ext.responsibility.ResponsibilityUnitExt;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
import com.moral.api.pojo.query.app.AppAllocationFileCond;
@@ -1013,16 +1014,19 @@
@Override
public Integer unitAreaCode() {
+ // 1 ��������� 0������ 2 ������������
QxUser user = UserHelper.getCurrentUser();
List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
if(CollectionUtils.isNotEmpty(userList)){
return 1;
}
if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0) {
- String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
- if (code.length() > 6) {
+ List<ResponsibilityUnitExt> codeList = responsibilityUnitMapper.selectResponsibilityUnitList(user.getUnitId());
+ if ( codeList.get(0).getAreaCode().length() > 6) {
return 0;
- } else {
+ } else if(codeList.get(0).getAreaCode().length() == 6 && codeList.get(0).getParentCode().equals("320900")) {
+ return 0;
+ }else {
return 2;
}
}
--
Gitblit v1.8.0