Merge remote-tracking branch 'origin/master'

boman-api/boman-domain/src/main/java/com.boman.domain/SysDept.java

@@ -48,6 +48,9 @@ public class SysDept extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
+    /***部门对应的区划编号***/
+    private String areaId;
+
     /** 父部门名称 */
     private String parentName;
 
@@ -208,6 +211,14 @@ public class SysDept extends BaseEntity
         this.num = num;
     }
 
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -225,6 +236,7 @@ public class SysDept extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("areaId", getAreaId())
             .toString();
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDeptServiceImpl.java

@@ -371,14 +371,14 @@ public class SysDeptServiceImpl implements ISysDeptService {
     @Override
     public List<SysDept> listChildrenDepts(Long deptId) {
         //先去缓存拿数据
-        List<SysDept> allDepts = redisService.getCacheList(CacheConstants.DEPT_LIST);
+        /*List<SysDept> allDepts = redisService.getCacheList(CacheConstants.DEPT_LIST);
         if (allDepts != null && allDepts.size()>0){
             log.info("我从缓存中拿到部门集合");
-        }else {
-             allDepts = selectDepts(new SysDept());
-            redisService.setCacheList(CacheConstants.DEPT_LIST,allDepts);
+        }else {*/
+            List<SysDept> allDepts = selectDepts(new SysDept());
+            //redisService.setCacheList(CacheConstants.DEPT_LIST,allDepts);
             log.info("我从数据库拿到部门集合");
-        }
+        //}
         SysDept sysDept = ObjectUtils.filterOne(allDepts, dept -> deptId.equals(dept.getId()));
         List<SysDept> returnData = Lists.newArrayListWithCapacity(16);
         if (null == sysDept) {

boman-modules/boman-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="areaId" column="area_id"/>
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time, d.area_id
         from sys_dept d
     </sql>
     

boman-modules/boman-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="orderNum" column="order_num"   />
 		<result property="leader"   column="leader"      />
 		<result property="status"   column="dept_status" />
+		<result property="areaId"   column="area_id" />
 	</resultMap>
 	
 	<resultMap id="RoleResult" type="com.boman.domain.SysRole">
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectUserVo">
         select u.id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.union_id, u.open_id,u.grid_id,
-        d.id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+        d.id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,d.area_id,
         r.id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.id
@@ -59,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="com.boman.domain.SysUser" resultMap="SysUserResult">
-		select u.id, u.grid_id,u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.id, u.grid_id,u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader, d.area_id from sys_user u
 		left join sys_dept d on u.dept_id = d.id
 		where u.del_flag = '0'
 		<if test="userName != null and userName != ''">