Browse Source

修改/epmet/ext/staff/permission接口,返参添加customerId

master
yinzuomei 5 years ago
parent
commit
f816d8d341
  1. 5
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtDeptResultDTO.java
  2. 5
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java
  3. 5
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java
  4. 10
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

5
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtDeptResultDTO.java

@ -23,4 +23,9 @@ public class ExtDeptResultDTO implements Serializable {
* 部门名称 * 部门名称
* */ * */
private String deptName; private String deptName;
/**
* 当前deptId所属的customerId add02.03
* */
private String customerId;
} }

5
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtGridResultDTO.java

@ -23,4 +23,9 @@ public class ExtGridResultDTO implements Serializable {
* 网格名称 * 网格名称
* */ * */
private String gridName; private String gridName;
/**
* 当前gridId所属的客户id add02.03
* */
private String customerId;
} }

5
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtStaffPermissionResultDTO.java

@ -45,4 +45,9 @@ public class ExtStaffPermissionResultDTO implements Serializable {
* 子集机关列表 * 子集机关列表
* */ * */
private List<ExtStaffPermissionResultDTO> subAgencyList = new ArrayList<>(); private List<ExtStaffPermissionResultDTO> subAgencyList = new ArrayList<>();
/**
* 当前agencyId所属的客户id add02.03
* */
private String customerId;
} }

10
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@ -208,14 +208,17 @@
<id column="agencyId" property="agencyId" /> <id column="agencyId" property="agencyId" />
<result column="agencyName" property="agencyName"/> <result column="agencyName" property="agencyName"/>
<result column="level" property="level" /> <result column="level" property="level" />
<result column="customerId" property="customerId"/>
<collection property="gridList" ofType="com.epmet.dto.result.ExtGridResultDTO"> <collection property="gridList" ofType="com.epmet.dto.result.ExtGridResultDTO">
<id column="gridId" property="gridId" /> <id column="gridId" property="gridId" />
<result column="gridName" property="gridName" /> <result column="gridName" property="gridName" />
<result column="customerId" property="customerId"/>
</collection> </collection>
<collection property="departmentList" column="agencyId" ofType="com.epmet.dto.result.ExtDeptResultDTO" select="selectDeptList"> <collection property="departmentList" column="agencyId" ofType="com.epmet.dto.result.ExtDeptResultDTO" select="selectDeptList">
<id column="deptId" property="deptId" /> <id column="deptId" property="deptId" />
<result column="deptName" property="deptName" /> <result column="deptName" property="deptName" />
<result column="customerId" property="customerId"/>
</collection> </collection>
<collection property="subAgencyList" column="agencyId" <collection property="subAgencyList" column="agencyId"
@ -240,8 +243,10 @@
agency.ID AS agencyId, agency.ID AS agencyId,
agency.ORGANIZATION_NAME AS agencyName, agency.ORGANIZATION_NAME AS agencyName,
agency.LEVEL AS level, agency.LEVEL AS level,
agency.CUSTOMER_ID as customerId,
grid.ID AS gridId, grid.ID AS gridId,
grid.GRID_NAME AS gridName grid.GRID_NAME AS gridName,
grid.CUSTOMER_ID as customerId
FROM FROM
CUSTOMER_AGENCY agency CUSTOMER_AGENCY agency
LEFT JOIN CUSTOMER_GRID grid ON agency.ID = grid.PID LEFT JOIN CUSTOMER_GRID grid ON agency.ID = grid.PID
@ -254,7 +259,8 @@
<select id="selectDeptList" resultType="com.epmet.dto.result.ExtDeptResultDTO"> <select id="selectDeptList" resultType="com.epmet.dto.result.ExtDeptResultDTO">
SELECT SELECT
ID AS deptId, ID AS deptId,
DEPARTMENT_NAME AS deptName DEPARTMENT_NAME AS deptName,
CUSTOMER_ID as customerId
FROM FROM
CUSTOMER_DEPARTMENT dept CUSTOMER_DEPARTMENT dept
WHERE WHERE

Loading…
Cancel
Save