ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

地区父级 岗位父级

Browse Source
This commit is contained in:
韩国东 2022-12-08 13:49:00 +08:00
parent 72abb76aee
commit 05bf113bfb
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
inventory-dao/src/main/java/com/rzyc/model/user/ListPerform.java
View File

@ -55,6 +55,12 @@ public class ListPerform implements Serializable {
@ApiModelProperty("可查看履职的职务id")
private String viewJurisdiction;
@ApiModelProperty("父级地址")
private String parentPath;
@ApiModelProperty("父级名称")
private String parentName;
@ApiModelProperty("创建时间")
private Date createdon;
@ -80,6 +86,22 @@ public class ListPerform implements Serializable {
private static final long serialVersionUID = 1L;
public String getParentPath() {
return parentPath;
}
public void setParentPath(String parentPath) {
this.parentPath = parentPath;
}
public String getParentName() {
return parentName;
}
public void setParentName(String parentName) {
this.parentName = parentName;
}
public String getSuperName() {
return superName;
}

8
inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
View File

@ -56,6 +56,9 @@
<result column="communityName" jdbcType="VARCHAR" property="communityName" />
<result column="qr_code" jdbcType="VARCHAR" property="qrCode"/>
<result column="street_code" jdbcType="VARCHAR" property="streetCode"/>
<result column="area_name" jdbcType="VARCHAR" property="areaName"/>
<result column="area_code" jdbcType="VARCHAR" property="areaCode"/>
<result column="area_path" jdbcType="VARCHAR" property="areaPath"/>
</resultMap>
<sql id="Base_Column_List">
@ -788,11 +791,8 @@
<select id="selectPCList" resultMap="BaseResultMap">
select sys.*,org.OrgName,st.OrgName streetName,cm.OrgName communityName
select sys.*
from SysEnterprise sys
left join SysOrg org on sys.OrgCode = org.OrgCode
left join SysOrg st on sys.street_code = st.OrgCode
left join SysOrg cm on sys.community_code = cm.OrgCode
where 1=1
<if test="2 == isAdmin">
AND sys.State='启用'

9
inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java
View File

@ -93,14 +93,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
getDatePage(pager,object);
if (object != null){
for(SysEnterprise enterprise : pager.getRows()){
String orgName = enterprise.getOrgName();
if(StringUtils.isNotBlank(enterprise.getStreetName())){
orgName = orgName + "-" + enterprise.getStreetName();
}
if(StringUtils.isNotBlank(enterprise.getCommunityName())){
orgName = orgName + "-" + enterprise.getCommunityName();
}
enterprise.setOrgName(orgName);
enterprise.setOrgName(enterprise.getAreaName());
}
singleResult.setMessage(Message.SUCCESS);