监审主体列表

uc/src/main/java/com/hotent/uc/dao/OrgDao.java

@@ -1,21 +1,19 @@
 package com.hotent.uc.dao;
 
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hotent.uc.model.Role;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.hotent.uc.model.Org;
 import com.hotent.uc.model.User;
 import com.hotent.uc.vo.OrgTreeVo;
 import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.hotent.uc.model.Org;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 
@@ -118,11 +116,16 @@ public interface OrgDao extends BaseMapper<Org>{
 	Org getByDemIdAndSonId(@Param("demId") String demId,@Param("sonId") String sonId);
 
 	/**
-	 * 根据维度ID获取组织列表
-	 * @param demId
-	 * @return
-	 */
-	List<Org> getOrgListByDemId(@Param("demId") String demId);
+     * 根据维度ID获取组织列表
+     *
+     * @param demId
+     * @param dataScope
+     * @param provinceCode
+     * @param cityCode
+     * @param countyCode
+     * @return
+     */
+	List<Org> getOrgListByDemId(@Param("demId") String demId, @Param("dataScope")Integer dataScope, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode,@Param("countyCode") String countyCode);
 	
 	/**
 	 * 获取用户所属（主）组织

uc/src/main/java/com/hotent/uc/manager/impl/OrgManagerImpl.java

@@ -1,6 +1,5 @@
 package com.hotent.uc.manager.impl;
 
-import cn.hutool.json.JSONObject;
 import com.alibaba.druid.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -351,7 +350,14 @@ public class OrgManagerImpl extends BaseManagerImpl<OrgDao, Org> implements OrgM
 
 	@Override
 	public List<Org> getOrgListByDemId(String demId) {
-		return baseMapper.getOrgListByDemId(demId);
+		User currentUser = ContextUtil.getCurrentUser();
+		currentUser = userManager.getById(currentUser.getId());
+		Integer dataScope = currentUser.getDataScope();
+		String provinceCode = currentUser.getProvinceCode();
+		String cityCode = currentUser.getCityCode();
+		String countyCode = currentUser.getCountyCode();
+
+		return baseMapper.getOrgListByDemId(demId,dataScope,provinceCode,cityCode,countyCode);
 	}
 
 	@Override
@@ -455,6 +461,10 @@ public class OrgManagerImpl extends BaseManagerImpl<OrgDao, Org> implements OrgM
 				o.setSuperiorOrgId(orgVo.getParentId());
 			}
 		}
+		o.setDataScope(orgVo.getDataScope());
+		o.setProvinceCode(orgVo.getProvinceCode());
+		o.setCityCode(orgVo.getCityCode());
+		o.setCountyCode(orgVo.getCountyCode());
 		this.create(o);
 		return new CommonResult<String>(true, "添加组织成功！", o.getId());
 	}
@@ -672,6 +682,10 @@ public class OrgManagerImpl extends BaseManagerImpl<OrgDao, Org> implements OrgM
 				o.setSuperiorOrgId(orgVo.getParentId());
 			}
 		}
+		o.setDataScope(orgVo.getDataScope());
+		o.setProvinceCode(orgVo.getProvinceCode());
+		o.setCityCode(orgVo.getCityCode());
+		o.setCountyCode(orgVo.getCountyCode());
 		this.updateByOrg(o);
 		return new CommonResult<String>(true, "组织更新成功！", "");
 	}

uc/src/main/java/com/hotent/uc/model/Org.java

@@ -1,10 +1,4 @@
 package com.hotent.uc.model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Map;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,6 +7,11 @@ import com.hotent.uc.api.constant.GroupStructEnum;
 import com.hotent.uc.api.constant.GroupTypeConstant;
 import com.hotent.uc.api.model.IGroup;
 import com.hotent.uc.api.model.IdentityType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import java.util.Map;
 
 
 
@@ -225,6 +224,22 @@ public class Org extends UcBaseModel<Org>  implements IGroup{
 	@ApiModelProperty(name = "extSetting", notes = "是否有外部系统配置 0=无1=有")
 	protected String extSetting;
 
+	@TableField("DATA_SCOPE")
+	@ApiModelProperty(name="dataScope",notes="人员（数据）级别0：省，1：市，2：区（县）")
+	private Integer dataScope;
+
+	@ApiModelProperty(value = "所属省")
+	@TableField("PROVINCE_CODE")
+	private String provinceCode;
+
+	@ApiModelProperty(value = "所属市")
+	@TableField("CITY_CODE")
+	private String cityCode;
+
+	@ApiModelProperty(value = "所属区、县")
+	@TableField("COUNTY_CODE")
+	private String countyCode;
+
 	public String getExtSetting() {
 		return extSetting;
 	}
@@ -530,4 +545,44 @@ public class Org extends UcBaseModel<Org>  implements IGroup{
 	public void setSuperiorDep(Org superiorDep) {
 		this.superiorDep = superiorDep;
 	}
+
+	public Integer getDataScope() {
+		return dataScope;
+	}
+
+	public void setDataScope(Integer dataScope) {
+		this.dataScope = dataScope;
+	}
+
+	public int getIsIsParent() {
+		return isIsParent;
+	}
+
+	public void setIsIsParent(int isIsParent) {
+		this.isIsParent = isIsParent;
+	}
+
+	public String getProvinceCode() {
+		return provinceCode;
+	}
+
+	public void setProvinceCode(String provinceCode) {
+		this.provinceCode = provinceCode;
+	}
+
+	public String getCityCode() {
+		return cityCode;
+	}
+
+	public void setCityCode(String cityCode) {
+		this.cityCode = cityCode;
+	}
+
+	public String getCountyCode() {
+		return countyCode;
+	}
+
+	public void setCountyCode(String countyCode) {
+		this.countyCode = countyCode;
+	}
 }

uc/src/main/java/com/hotent/uc/params/org/OrgVo.java

@@ -1,15 +1,12 @@
 package com.hotent.uc.params.org;
 
 import com.hotent.base.annotation.ExcelColumn;
+import com.hotent.base.util.AppUtil;
+import com.hotent.base.util.BeanUtils;
 import com.hotent.uc.manager.OrgManager;
 import com.hotent.uc.model.Org;
-import com.hotent.uc.model.Role;
-import com.hotent.uc.params.role.RoleVo;
 import com.hotent.uc.util.OperateLogUtil;
 import com.hotent.uc.util.UpdateCompare;
-import com.hotent.base.util.AppUtil;
-import com.hotent.base.util.BeanUtils;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -62,6 +59,19 @@ public class OrgVo implements UpdateCompare {
 	@ApiModelProperty(name="joinExtSystemSyndir",notes="同步方向0=向第三方系统同步 ，1=第三方系统向中台同步",required=false)
 	private String joinExtSystemSyndir;
 
+
+	@ApiModelProperty(name="dataScope",notes="人员（数据）级别0：省，1：市，2：区（县）")
+	private Integer dataScope;
+
+	@ApiModelProperty(value = "所属省")
+	private String provinceCode;
+
+	@ApiModelProperty(value = "所属市")
+	private String cityCode;
+
+	@ApiModelProperty(value = "所属区、县")
+	private String countyCode;
+
 	public String getJoinExtSystemType() {
 		return joinExtSystemType;
 	}
@@ -166,6 +176,38 @@ public class OrgVo implements UpdateCompare {
 		this.orgType = orgType;
 	}
 
+	public Integer getDataScope() {
+		return dataScope;
+	}
+
+	public void setDataScope(Integer dataScope) {
+		this.dataScope = dataScope;
+	}
+
+	public String getProvinceCode() {
+		return provinceCode;
+	}
+
+	public void setProvinceCode(String provinceCode) {
+		this.provinceCode = provinceCode;
+	}
+
+	public String getCityCode() {
+		return cityCode;
+	}
+
+	public void setCityCode(String cityCode) {
+		this.cityCode = cityCode;
+	}
+
+	public String getCountyCode() {
+		return countyCode;
+	}
+
+	public void setCountyCode(String countyCode) {
+		this.countyCode = countyCode;
+	}
+
 	public String toString() {
 		return "{"
 				+ "\""+"name"+"\""+":"+"\""+this.name+"\","

uc/src/main/resources/mapper/OrgMapper.xml

@@ -156,6 +156,14 @@
 		select
 		<include refid="Base_Column_List" />
 		from UC_ORG where DEM_ID_ = #{demId} AND IS_DELE_!='1'
+		<if test="dataScope != null">
+			<if test=" dataScope ==1">
+				and CITY_CODE=#{ cityCode}
+			</if>
+			<if test=" dataScope ==2">
+				and COUNTY_CODE=#{ countyCode}
+			</if>
+		</if>
 	</select>
 
 	<select id="getOrgsByAccount" parameterType="java.lang.String" resultMap="BaseResultMap">