派工发料负责人向下包含部门的人

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UnitInfoMapper.java

@@ -23,7 +23,8 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
   //获取单位分页列表 @Param("offset") long offset,  @Param("pageSize") long  pageSize,
     IPage<CompanyDto> getCompanyDto(@Param("dto") CompanyDto dto);
     Map<String,Integer> getCompanyDtoCount(@Param("dto")CompanyDto dto);
-    List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
+    //List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
+    List< Map<String,Object>> getuserListByOrgCode(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosOrgCode") String amosOrgCode);
     List< Map<String,Object>> getuserListtelephone(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
 
     @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={} ,fieldConditions ={"in"} ,relationship="and")

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/UnitInfoMapper.xml

@@ -63,6 +63,32 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
     </select>
 
 
+    <select id="getuserListByOrgCode" resultType="Map">
+
+        select
+        DISTINCT std_user_biz.real_name realName
+        from
+        std_user_biz LEFT JOIN hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id
+
+        <where>
+            <if test="role!=null">
+                and std_user_biz.role like concat(concat("%",#{role}),"%")
+            </if>
+            <if test="regionalCompaniesSeq!=null">
+                and hygf_personnel_business.regional_companies_seq=#{regionalCompaniesSeq}
+            </if>
+            <if test="amosOrgCode!=null">
+                and hygf_personnel_business.amos_unit_org_code like concat ('%',#{amosOrgCode},'%')
+            </if>
+            <if test="userName!=null">
+                and  std_user_biz.amos_user_id=#{userName}
+            </if>
+        </where>
+
+
+    </select>
+
+
     <select id="getuserListtelephone" resultType="Map">
 
         select

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -810,7 +810,8 @@ public ResponseModel< List<Map<String,Object>> > getRegionalCompanieByuser(
 
     ) {
         UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
-        List<Map<String,Object>>  date= unitInfoMapper.getuserList(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerId());
+       // List<Map<String,Object>>  date= unitInfoMapper.getuserList(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerId());
+        List<Map<String,Object>>  date= unitInfoMapper.getuserListByOrgCode(null,role,regionalCompaniesSeq,userUnitInformationDto.getAmosDealerOrgCode());
         return ResponseHelper.buildResponse(date);
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY)