admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
pengjie 2023-11-03 18:40:17 +08:00
parent e638c6e2f2
commit 2c6a8b69f3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/GovernmentServiceImpl.java
View File

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