档案管理：页面右上角显示机构改为全宗名称

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

@@ -9,17 +9,18 @@ import java.sql.SQLException;
 import java.util.*;
 import java.util.Map.Entry;
 import javax.inject.Inject;
+
+import com.archser.aserver.model.Fond;
 import com.archser.aserver.model.Organ;
 import com.archser.aserver.model.User;
 import com.archser.aserver.service.UserService;
+import com.jfinal.aop.Aop;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.HashKit;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.Ret;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
-import com.jfinal.plugin.redis.Redis;
-import javax.sound.sampled.Line.Info;
 import org.apache.commons.codec.binary.Base64;
 
 /**
@@ -29,18 +30,17 @@ import org.apache.commons.codec.binary.Base64;
  *
  */
 public class UserController extends Controller {
-  
-  private static final String _INFO = "_INFO";
-  
-  
-  /**
-   * 获取用户信息
-   */
+	
+	UserService userService = Aop.get(UserService.class);
+	
+	/**
+	 * 获取用户信息
+	 */
 	public void info() {
 		String username = this.getAttr("username");
-    User user = InfoUser.getUser(username);
-    user.remove("password");
-    Organ organ = InfoOrgan.getOrgan(user.getOrganId());
+		User user = InfoUser.getUser(username);
+		user.remove("password");
+		Organ organ = InfoOrgan.getOrgan(user.getOrganId());
 		if (organ != null) {
 			Iterator<Entry<String, Object>> organIterator = organ._getAttrsEntrySet().iterator();
 			Entry<String, Object> organAttr = null;
@@ -48,10 +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());
+			}
 		}
 		this.renderJson(Ret.ok("userInfo", user));
 	}
-  
+
   /**
    * 修改用户密码
  * @throws SQLException 

src/main/java/com/archser/aserver/generator/MyMetaBuilder.java

@@ -31,6 +31,8 @@ public class MyMetaBuilder extends MetaBuilder {
         return false;
       case "AS_MESSAGE":
         return false;
+      case "AS_FOND":
+        return false;
       default:
         return true;
     }

src/main/java/com/archser/aserver/model/Fond.java

+package com.archser.aserver.model;
+
+import com.archser.aserver.model.base.BaseFond;
+
+/**
+ * Generated by JFinal.
+ */
+@SuppressWarnings("serial")
+public class Fond extends BaseFond<Fond> {
+	public static final Fond dao = new Fond().dao();
+}

src/main/java/com/archser/aserver/model/_DataDictionary.txt

@@ -8,6 +8,21 @@ Table: AS_CONFIG
  DESCRIPTION | VARCHAR2(255) | YES  |     |         |         
 -------------+---------------+------+-----+---------+---------
 
+Table: AS_FOND
+-------------+-----------------+------+-----+---------+---------
+ Field       | Type            | Null | Key | Default | Remarks 
+-------------+-----------------+------+-----+---------+---------
+ ID          | NUMBER          | NO   | PRI |         |         
+ FOND_ID     | VARCHAR2(40)    | YES  |     |         | 全宗id    
+ NAME        | VARCHAR2(40)    | YES  |     |         | 全宗名称    
+ DESCRIPTION | VARCHAR2(255)   | YES  |     |         | 全宗描述    
+ ORGAN_ID    | VARCHAR2(40)    | YES  |     |         | 关联机构    
+ CREATE_TIME | TIMESTAMP(36,6) | YES  |     |         | 创建时间    
+ REMARK      | VARCHAR2(255)   | YES  |     |         | 备注      
+ IDSEQ       | VARCHAR2(500)   | YES  |     |         |         
+ PREFER      | NUMBER(3)       | YES  |     |         | 设置默认全宗  
+-------------+-----------------+------+-----+---------+---------
+
 Table: AS_LOG
 -------------+-----------------+------+-----+---------+---------
  Field       | Type            | Null | Key | Default | Remarks 
@@ -83,16 +98,6 @@ Table: AS_ORGAN
  RANKING | NUMBER(4)      | YES  |     |         |         
 ---------+----------------+------+-----+---------+---------
 
-Table: AS_SN	Remarks: SN唯一码校验表
--------------+----------------+------+-----+---------+---------
- Field       | Type           | Null | Key | Default | Remarks 
--------------+----------------+------+-----+---------+---------
- ID          | INTEGER(10)    | NO   | PRI |         |         
- UNIQUE_CODE | VARCHAR2(500)  | NO   |     |         | 服务器CPU唯一标识
- SN_CODE     | VARCHAR2(1000) | NO   |     |         | SN校验码   
- ORGAN_NAME  | VARCHAR2(50)   | YES  |     |         | 机构名称    
--------------+----------------+------+-----+---------+---------
-
 Table: AS_SYSTEM
 -------------+----------------+------+-----+---------+---------
  Field       | Type           | Null | Key | Default | Remarks 

src/main/java/com/archser/aserver/model/_MappingKit.java

@@ -17,6 +17,7 @@ public class _MappingKit {
 	
 	public static void mapping(ActiveRecordPlugin arp) {
 		arp.addMapping("AS_CONFIG", "ID", Config.class);
+		arp.addMapping("AS_FOND", "ID", Fond.class);
 		arp.addMapping("AS_LOG", "ID", Log.class);
 		arp.addMapping("AS_MENU", "ID", Menu.class);
 		arp.addMapping("AS_MENU_STAR", "ID", MenuStar.class);

src/main/java/com/archser/aserver/model/base/BaseFond.java

+package com.archser.aserver.model.base;
+
+import com.jfinal.plugin.activerecord.Model;
+import com.jfinal.plugin.activerecord.IBean;
+
+/**
+ * Generated by JFinal, do not modify this file.
+ */
+@SuppressWarnings({"serial", "unchecked"})
+public abstract class BaseFond<M extends BaseFond<M>> extends Model<M> implements IBean {
+
+	public M setId(java.lang.Integer id) {
+		set("ID", id);
+		return (M)this;
+	}
+	
+	public java.lang.Integer getId() {
+		return getInt("ID");
+	}
+
+	/**
+	 * 全宗id
+	 */
+	public M setFondId(java.lang.String fondId) {
+		set("FOND_ID", fondId);
+		return (M)this;
+	}
+	
+	/**
+	 * 全宗id
+	 */
+	public java.lang.String getFondId() {
+		return getStr("FOND_ID");
+	}
+
+	/**
+	 * 全宗名称
+	 */
+	public M setName(java.lang.String name) {
+		set("NAME", name);
+		return (M)this;
+	}
+	
+	/**
+	 * 全宗名称
+	 */
+	public java.lang.String getName() {
+		return getStr("NAME");
+	}
+
+	/**
+	 * 全宗描述
+	 */
+	public M setDescription(java.lang.String description) {
+		set("DESCRIPTION", description);
+		return (M)this;
+	}
+	
+	/**
+	 * 全宗描述
+	 */
+	public java.lang.String getDescription() {
+		return getStr("DESCRIPTION");
+	}
+
+	/**
+	 * 关联机构
+	 */
+	public M setOrganId(java.lang.String organId) {
+		set("ORGAN_ID", organId);
+		return (M)this;
+	}
+	
+	/**
+	 * 关联机构
+	 */
+	public java.lang.String getOrganId() {
+		return getStr("ORGAN_ID");
+	}
+
+	/**
+	 * 创建时间
+	 */
+	public M setCreateTime(java.util.Date createTime) {
+		set("CREATE_TIME", createTime);
+		return (M)this;
+	}
+	
+	/**
+	 * 创建时间
+	 */
+	public java.util.Date getCreateTime() {
+		return get("CREATE_TIME");
+	}
+
+	/**
+	 * 备注
+	 */
+	public M setRemark(java.lang.String remark) {
+		set("REMARK", remark);
+		return (M)this;
+	}
+	
+	/**
+	 * 备注
+	 */
+	public java.lang.String getRemark() {
+		return getStr("REMARK");
+	}
+
+	public M setIdseq(java.lang.String idseq) {
+		set("IDSEQ", idseq);
+		return (M)this;
+	}
+	
+	public java.lang.String getIdseq() {
+		return getStr("IDSEQ");
+	}
+
+	/**
+	 * 设置默认全宗
+	 */
+	public M setPrefer(java.lang.Integer prefer) {
+		set("PREFER", prefer);
+		return (M)this;
+	}
+	
+	/**
+	 * 设置默认全宗
+	 */
+	public java.lang.Integer getPrefer() {
+		return getInt("PREFER");
+	}
+
+}

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

@@ -4,6 +4,8 @@ import com.archser.aserver.util.redis.InfoUser;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+
+import com.archser.aserver.model.Fond;
 import com.archser.aserver.model.Menu;
 import com.archser.aserver.model.System;
 import com.archser.aserver.model.User;
@@ -260,5 +262,15 @@ public class UserService {
       throw e;
     }
   }
+  
+  /**
+   * 根据部门Id查询全宗信息
+   * 
+   * @author: zhanglongfa
+   * @date: 2020年12月22日
+   */
+  public Fond getFondDataByOrganId(Integer organId) {
+	  return Fond.dao.findFirst(Db.getSqlPara("getFondDataByOrganId", Kv.by("organ_id", organId)));
+  }
 
 }

src/main/resources/oracle.sql

 ### SQL模板
 
+### 根据部门Id查询全宗信息
+#sql("getFondDataByOrganId")
+	select * from as_fond where organ_id =#para(organ_id)
+#end
+
 ### 获取指定名称的配置
 #sql("getConfigByName")
 select val from AS_CONFIG where NAME=?