hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-11 03:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cloud' into dev0731

Browse Source
This commit is contained in:
yujicun
2023-08-01 18:14:21 +08:00
parent ce4737f8a9 fc19492596
commit ccd86b78ac
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java
View File

@@ -33,7 +33,12 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
private String getNodeText(JsonNode jn) { private String getNodeText(JsonNode jn) {
if(jn!=null) { if(jn!=null) {
return jn.requireNonNull().asText(); String str = jn.asText();
if("null".equals(str)) {
return "";
}else {
return str;
}
}else { }else {
return ""; return "";
} }

15
servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java
View File

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.xboe.account.entity.Account; import com.xboe.account.entity.Account;
import com.xboe.account.service.IAccountService; import com.xboe.account.service.IAccountService;
import com.xboe.common.utils.StringUtil;
import com.xboe.core.CurrentUser; import com.xboe.core.CurrentUser;
import com.xboe.core.JsonResponse; import com.xboe.core.JsonResponse;
import com.xboe.core.api.ApiBaseController; import com.xboe.core.api.ApiBaseController;
@@ -20,7 +19,6 @@ import com.xboe.core.api.TokenProxy;
import com.xboe.data.dto.UserData; import com.xboe.data.dto.UserData;
import com.xboe.data.outside.IOutSideDataService; import com.xboe.data.outside.IOutSideDataService;
import com.xboe.module.teacher.service.ITeacherService; import com.xboe.module.teacher.service.ITeacherService;
import com.xboe.system.organization.entity.Organization;
import com.xboe.system.organization.service.IOrganizationService; import com.xboe.system.organization.service.IOrganizationService;
import com.xboe.system.user.entity.User; import com.xboe.system.user.entity.User;
import com.xboe.system.user.service.IUserService; import com.xboe.system.user.service.IUserService;
@@ -74,7 +72,7 @@ public class PortalConsoleApi extends ApiBaseController{
User user = userService.get(getCurrent().getAccountId()); User user = userService.get(getCurrent().getAccountId());
String departName = ""; String departName = userData.getDepartName();
String departFullName = userData.getOrgNamePath(); String departFullName = userData.getOrgNamePath();
// Organization org = null; // Organization org = null;
@@ -129,9 +127,12 @@ public class PortalConsoleApi extends ApiBaseController{
map.put("adminType",userData==null? 0:userData.getAdminType());//管理员类型，1表默认管理员，2表非默认管理员，0表不是管理员 map.put("adminType",userData==null? 0:userData.getAdminType());//管理员类型，1表默认管理员，2表非默认管理员，0表不是管理员
//map.put("adminType",2); //map.put("adminType",2);
map.put("companyId",user.getCompanyId()); map.put("companyId",user.getCompanyId());
map.put("name",user.getName()); // map.put("name",user.getName());
map.put("sex",user.getGender()); // map.put("sex",user.getGender());
map.put("userNo",user.getUserNo()); // map.put("userNo",user.getUserNo());
map.put("name",userData.getName());
map.put("sex",userData.getGender());
map.put("userNo",userData.getCode());
map.put("showHome",user.getShowHome()==null? true:user.getShowHome()); map.put("showHome",user.getShowHome()==null? true:user.getShowHome());
if(isLocalDevelopment()) { if(isLocalDevelopment()) {
map.put("userType",5); map.put("userType",5);
@@ -139,7 +140,7 @@ public class PortalConsoleApi extends ApiBaseController{
map.put("userType",utype); map.put("userType",utype);
} }
map.put("departId",user.getDepartId()); map.put("departId",userData.getDepartId());
map.put("sign",user.getSign()); map.put("sign",user.getSign());
map.put("departName",departName); map.put("departName",departName);
map.put("departFullName",departFullName); map.put("departFullName",departFullName);