用户的机构名称显示为用户所在全宗的立档案单位的机构名称

src/main/java/com/archser/aserver/controller/UserController.java

@@ -48,11 +48,16 @@ public class UserController extends Controller {
 				organAttr = organIterator.next();
 				user.put("ORGAN_" + organAttr.getKey(), organAttr.getValue());
 			}
-			
 			//机构名称修改为全宗名称
-			Fond fond = userService.getFondDataByOrganId(organ.getId());
-			if(fond != null) {
-				user.put("organ_name", fond.getName());
+//			Fond fond = userService.getFondDataByOrganId(organ.getId());
+      /**
+       * 用户机构名称为立党单位的名称
+       * @author 李德才
+       * @date 2021/1/8 17:07
+       */
+      Organ userFondOrgan = userService.getUserFondOrgan(user);
+      if(userFondOrgan != null) {
+				user.put("organ_name", userFondOrgan.getName());
 			}
 		}
 		this.renderJson(Ret.ok("userInfo", user));

src/main/java/com/archser/aserver/service/UserService.java

 package com.archser.aserver.service;
 
+import com.archser.aserver.model.Organ;
 import com.archser.aserver.util.redis.InfoUser;
 import java.util.ArrayList;
 import java.util.List;
@@ -16,6 +17,7 @@ import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.tx.Tx;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.xpath.operations.Or;
 
 
 public class UserService {
@@ -273,4 +275,23 @@ public class UserService {
 	  return Fond.dao.findFirst(Db.getSqlPara("getFondDataByOrganId", Kv.by("organ_id", organId)));
   }
 
+
+  /**
+   * 获取用户的立党单位
+   * @author 李德才
+   * @param: user
+   * @date 2021/1/8 17:05
+   * @return com.archser.aserver.model.Organ
+   */
+  public Organ getUserFondOrgan(User user) {
+    Integer organId = user.getOrganId();
+    Organ organ = Organ.dao.findById(organId);
+    if (!"Y".equalsIgnoreCase(organ.getIsunit())) {
+      String[] split = organ.getIdseq().split("\\.");
+      String fondOrganId = split[split.length - 1];
+      organ = Organ.dao.findById(fondOrganId);
+    }
+    return organ;
+  }
+
 }