From e0b8a22df9a40e1b5691140e23721d2c0a5a5a0b Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Fri, 25 Oct 2024 09:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_grid' into gzdyh_grid
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
index 36af820..1870e34 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java
@@ -332,10 +332,10 @@
unitSelectTerm.setLabel(ctUnit.getUnitName());
unitSelectTerm.setParentId(ctUnit.getParentId());
unitSelectTerm.setCheckable(true);
- if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){
szbmList.add(unitSelectTerm);
}
- if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_101 == ctUnit.getUnitType()){
qzzzxList.add(unitSelectTerm);
}
}
@@ -380,10 +380,10 @@
unitSelectTerm.setLabel(ctUnit.getUnitName());
unitSelectTerm.setParentId(ctUnit.getParentId());
unitSelectTerm.setCheckable(true);
- if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){
qzbmList.add(unitSelectTerm);
}
- if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_101 == ctUnit.getUnitType()){
zjzzzxList.add(unitSelectTerm);
}
}
@@ -514,10 +514,10 @@
unitSelectTerm.setLabel(ctUnit.getUnitName());
unitSelectTerm.setParentId(ctUnit.getParentId());
unitSelectTerm.setCheckable(true);
- if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_101 == ctUnit.getUnitType()){
szbmList.add(unitSelectTerm);
}
- if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){
qzzzxList.add(unitSelectTerm);
}
}
@@ -562,10 +562,10 @@
unitSelectTerm.setLabel(ctUnit.getUnitName());
unitSelectTerm.setParentId(ctUnit.getParentId());
unitSelectTerm.setCheckable(true);
- if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_102 == ctUnit.getUnitType()){
qzbmList.add(unitSelectTerm);
}
- if (UserBaseConsts.UNIT_TYPE_3 == ctUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_103 == ctUnit.getUnitType()){
zjzzzxList.add(unitSelectTerm);
}
}
@@ -661,7 +661,7 @@
ctUnitQueryWrapper.eq("id", unitId).select("parent_id");
CtUnit loginCtUnit = mapper.selectOne(ctUnitQueryWrapper);
ctUnitQueryWrapper.clear();
- ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_1);
+ ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_101);
CtUnit zzzxCtUnit = mapper.selectOne(ctUnitQueryWrapper);
CtUnitDTO ctUnitDTO = new CtUnitDTO();
BeanUtils.copyProperties(zzzxCtUnit, ctUnitDTO);
@@ -682,12 +682,12 @@
CtUnitDTO ctUnitDTO = new CtUnitDTO();
// 查询自己是否是综治中心
CtUnit loginCtUnit = mapper.selectById(unitId);
- if (UserBaseConsts.UNIT_TYPE_1 == loginCtUnit.getUnitType()){
+ if (UserBaseConsts.UNIT_TYPE_101 == loginCtUnit.getUnitType()){
BeanUtils.copyProperties(loginCtUnit, ctUnitDTO);
}else {
// 查询当前单位的上级综治中心
QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_1);
+ ctUnitQueryWrapper.eq("id", loginCtUnit.getParentId()).eq("unit_type", UserBaseConsts.UNIT_TYPE_101);
CtUnit zzzxCtUnit = mapper.selectOne(ctUnitQueryWrapper);
BeanUtils.copyProperties(zzzxCtUnit, ctUnitDTO);
}
--
Gitblit v1.8.0