liupeng 4 years ago
parent
commit
5fcd4cde37

+ 1 - 11
code/sapparent/sapservice/src/main/java/org/fouram/core/plugin/weixin/cp/util/WXCpUserUtil.java

@@ -181,16 +181,6 @@ public class WXCpUserUtil {
 	}
 
 	public static void main(String[] args) {
-		try {
-			WxCpUser user = getByIdOrEmail("300026", "juri.hu@cmcinc.cn");
-			user.setEmail("111");
-			userService.update(user);
-		} catch (WxErrorException ex) {
-			if (ex.getClass().getSimpleName().equals(WxErrorException.class.getSimpleName())) {
-				System.out.println(ex.getMessage());
-			} else {
-				System.out.println("error");
-			}
-		}
+		System.out.println(getByIdOrEmail("800039", null));
 	}
 }

+ 13 - 10
code/sapparent/sapservice/src/main/java/org/fouram/entity/SapUser.java

@@ -97,16 +97,19 @@ public class SapUser implements Serializable {
 	}
 
 	public String getFullOrgName() {
-		StringBuffer sb = new StringBuffer(firstOrgName);
-		if (secondOrgName != null) {
-			sb.append("/").append(secondOrgName);
+		if(StringUtils.isNotBlank(firstOrgName)) {
+			StringBuffer sb = new StringBuffer(firstOrgName);
+			if (secondOrgName != null) {
+				sb.append("/").append(secondOrgName);
+			}
+			if (thirdOrgName != null) {
+				sb.append("/").append(thirdOrgName);
+			}
+			if (fourthOrgName != null) {
+				sb.append("/").append(fourthOrgName);
+			}
+			return sb.toString();
 		}
-		if (thirdOrgName != null) {
-			sb.append("/").append(thirdOrgName);
-		}
-		if (fourthOrgName != null) {
-			sb.append("/").append(fourthOrgName);
-		}
-		return sb.toString();
+		return "";
 	}
 }

+ 1 - 0
code/sapparent/sapservice/src/main/java/org/fouram/entity/SysMenu.java

@@ -26,5 +26,6 @@ public class SysMenu implements Serializable {
 	private String parentId;
 	private String orderBy;
 	private List<SysMenu> subMenu;
+	@Builder.Default
 	private boolean hasMenu = false;
 }