From 2c6a8b69f36e5ebd39bc216ce5584cac86df22cc Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 3 Nov 2023 18:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GovernmentServiceImpl.java        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java
index 9274d51..2a7d36e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java
@@ -21,7 +21,6 @@ import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
 import com.zhgd.xmgl.modules.basicdata.service.IGovernmentService;
 import com.zhgd.xmgl.modules.basicdata.vo.GovernmentVo;
 import com.zhgd.xmgl.util.CommonUtil;
-import com.zhgd.xmgl.util.Sm4Util;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -79,7 +78,7 @@ public class GovernmentServiceImpl extends ServiceImpl<GovernmentMapper, Governm
         systemUser.setCreateTime(new Date());
         systemUser.setSn(government.getGovernmentSn());
         systemUser.setIsManager(true);
-        systemUser.setAccountType(2);
+        systemUser.setAccountType(governmentVo.getParentId() == null ? 5 : 2);
         return systemUserMapper.insert(systemUser);
     }
 
@@ -98,6 +97,7 @@ public class GovernmentServiceImpl extends ServiceImpl<GovernmentMapper, Governm
         systemUser.setAccount(governmentVo.getAccount());
         systemUser.setShowPassword(governmentVo.getPassword());
         systemUser.setRealName(governmentVo.getGovernmentName());
+        systemUser.setState(governmentVo.getState());
         return systemUserMapper.update(systemUser, Wrappers.<SystemUser>lambdaQuery()
                 .eq(SystemUser::getIsManager, true).eq(SystemUser::getSn, government.getGovernmentSn()));
     }
@@ -135,10 +135,12 @@ public class GovernmentServiceImpl extends ServiceImpl<GovernmentMapper, Governm
     public Page<Government> treeList(Page page, QueryWrapper<Government> queryWrapper) {
         queryWrapper.lambda().eq(Government::getParentId, "0L");
         Page<Government> pageList = this.page(page, queryWrapper);
-        List<Government> list = this.list(Wrappers.<Government>lambdaQuery().in(Government::getParentId, pageList.getRecords().stream().map(g -> g.getGovernmentId()).collect(Collectors.toList())));
-        build(list);
-        getTreeList(pageList.getRecords(), list);
-        build(pageList.getRecords());
+        if (pageList.getRecords().size() > 0) {
+            List<Government> list = this.list(Wrappers.<Government>lambdaQuery().in(Government::getParentId, pageList.getRecords().stream().map(g -> g.getGovernmentId()).collect(Collectors.toList())));
+            build(list);
+            getTreeList(pageList.getRecords(), list);
+            build(pageList.getRecords());
+        }
         return pageList;
     }