Sfoglia il codice sorgente

fix(national-motion-system-biz): 修复电子签名和用户列表过滤问题

- 在 ESignServiceImpl 中增加对 appSite 为空的判断,提高代码健壮性
- 在 SysUserServiceImpl 中添加过滤 admin 用户的功能,满足业务需求
SheepHy 5 giorni fa
parent
commit
2577d80023

+ 1 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/ESignServiceImpl.java

@@ -90,6 +90,7 @@ public class ESignServiceImpl implements IESignService {
     public boolean getOrgIdentityInfos(String orgCode) throws EsignDemoException {
         SysDepart sysDepart = sysDepartMapper.selectOne(Wrappers.<SysDepart>lambdaQuery().eq(SysDepart::getOrgCode, orgCode));
         AppSite appSite = appSiteMapper.selectOne(Wrappers.<AppSite>lambdaQuery().eq(AppSite::getOrgCode, orgCode));
+        if(appSite == null) return false;
         EsignHttpResponse getOrgIdentityInfo = getOrgIdentityInfo(sysDepart.getDepartName());
         JsonObject getOrgIdentityInfoObject = gson.fromJson(getOrgIdentityInfo.getBody(), JsonObject.class);
         JsonElement dataElement = getOrgIdentityInfoObject.get("data");

+ 5 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -233,6 +233,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		result.setSuccess(true);
 		result.setResult(pageList);
 		//log.info(pageList.toString());
+		// 获取分页数据并过滤掉 admin 用户
+		List<SysUser> filteredList = pageList.getRecords().stream()
+				.filter(user -> !"admin".equals(user.getUsername()))
+				.collect(Collectors.toList());
+		pageList.setRecords(filteredList);
 		return result;
 	}