主管

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java

@@ -166,6 +166,7 @@ public class SystemUserController {
             @ApiImplicitParam(name = "workerId", required = false, value = "劳务人员id", paramType = "body"),
             @ApiImplicitParam(name = "enterpriseId", required = false, value = "企业id（多个，分割）", paramType = "body"),
             @ApiImplicitParam(name = "enterpriseTypeId", required = false, value = "企业类型id", paramType = "body"),
+            @ApiImplicitParam(name = "xzProjectOrgId", required = false, value = "星纵-项目组织机构id", paramType = "body"),
     })
     @PostMapping(value = "/getProjectChilderSystemUserList")
     public Result<List<SystemUser>> getProjectChilderSystemUserList(@RequestBody Map<String, Object> map) {

src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml

@@ -18,6 +18,7 @@
         LEFT JOIN xz_project_org po on po.id=a.xz_project_org_id
         LEFT JOIN enterprise_info ei on ei.id=d.enterprise_id
         LEFT JOIN project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn=a.sn
+        left join xz_project_org po on po.id=a.xz_project_org_id
         WHERE a.sn = #{projectSn}
         and a.account_type = 6
         <if test="workerName != null and workerName != ''">
@@ -35,6 +36,9 @@
         <if test="enterpriseTypeId != null and enterpriseTypeId != ''">
             and pe.enterprise_type_id = #{enterpriseTypeId}
         </if>
+        <if test="xzProjectOrgId != null and xzProjectOrgId != ''">
+            and po.id = #{xzProjectOrgId}
+        </if>
     </select>
     <select id="findByUsername" resultType="com.zhgd.xmgl.modules.basicdata.entity.SystemUser" parameterType="string">
         select *

src/main/java/com/zhgd/xmgl/modules/xz/entity/XzProjectOrg.java

@@ -57,11 +57,11 @@ public class XzProjectOrg implements Serializable {
     @ApiModelProperty(value = "显示顺序")
     private java.lang.Integer orderNum;
     /**
-     * 负责人
+     * 主管id
      */
-    @Excel(name = "负责人", width = 15)
-    @ApiModelProperty(value = "负责人")
-    private java.lang.String leader;
+    @Excel(name = "主管id", width = 15)
+    @ApiModelProperty(value = "主管id")
+    private java.lang.Long leader;
     /**
      * 联系电话
      */