付款管理-选择企业：部门搜索

数据权限-调整

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/controller/HlgCompanyController.java

@@ -487,11 +487,11 @@ public class HlgCompanyController {
      * @return
      */
     @GetMapping(value = "/allCompanyList")
-    public Result<List<HlgCompany>> queryAllCompanyList(HttpServletRequest req) {
+    public Result<List<HlgCompany>> queryAllCompanyList(HlgCompany hlgCompany, HttpServletRequest req) {
         Result<List<HlgCompany>> result = new Result<List<HlgCompany>>();
         // 获取登录用户信息
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        List<HlgCompany> list = hlgCompanyService.findAllCompanyListByOrgcode(sysUser.getOrgCode());
+        List<HlgCompany> list = hlgCompanyService.findAllCompanyListByOrgcode(hlgCompany, sysUser.getOrgCode());
         result.setResult(list);
         return result;
     }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/mapper/HlgCompanyMapper.java

@@ -12,16 +12,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: hlg_company
  * @Author: jeecg-boot
- * @Date:   2020-02-17
+ * @Date: 2020-02-17
  * @Version: V1.0
  */
 public interface HlgCompanyMapper extends BaseMapper<HlgCompany> {
 
-    List<HlgCompany> findList(Page<HlgCompany> pageList, @Param("hlgCompany")HlgCompany hlgCompany,@Param(Constants.WRAPPER) QueryWrapper<HlgCompany> queryWrapper);
+    List<HlgCompany> findList(Page<HlgCompany> pageList, @Param("hlgCompany") HlgCompany hlgCompany, @Param(Constants.WRAPPER) QueryWrapper<HlgCompany> queryWrapper);
 
     int getCountByPlatformId(@Param("id") String id);
 
-    List<HlgCompany> findAllCompanyListByOrgcode(String orgCode);
+    List<HlgCompany> findAllCompanyListByOrgcode(@Param("hlgCompany") HlgCompany hlgCompany, @Param("orgCode") String orgCode);
 
     List<HlgCompany> findCompanyPayList();
 

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/mapper/xml/HlgCompanyMapper.xml

@@ -163,7 +163,10 @@
 		<include refid="hlgCompanyColumns"/>
 		FROM hlg_company a
 		<include refid="hlgCompanyJoins"/>
-		WHERE a.sys_org_code like  concat(#{0},'%')
+		WHERE a.sys_org_code like  concat(#{orgCode},'%')
+		<if test="hlgCompany.companyName != null and hlgCompany.companyName !=''">
+			and a.company_name LIKE concat('%',#{hlgCompany.companyName},'%')
+		</if>
 	</select>
 
     <!--查询供平台支付付款企业选择-->

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/service/IHlgCompanyService.java

@@ -27,7 +27,7 @@ public interface IHlgCompanyService extends IService<HlgCompany> {
 
     int getCountByPlatformId(String id);
 
-    List<HlgCompany> findAllCompanyListByOrgcode(String orgCode);
+    List<HlgCompany> findAllCompanyListByOrgcode(HlgCompany hlgCompany, String orgCode);
 
     void removeCompanyById(String id);
 

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/service/impl/HlgCompanyServiceImpl.java

@@ -89,6 +89,10 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
         //获取当前登录用户
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> companyCodeList = RoleDataUtils.findCompanyCodeList(sysUser.getUsername(), routeUrl, sysUser.getOrgCode());
+        if (companyCodeList.size() == 0) {
+            page.setRecords(Collections.emptyList());
+            return page;
+        }
         //慧盈查询用户列表
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.companyList;
@@ -328,8 +332,8 @@ public class HlgCompanyServiceImpl extends ServiceImpl<HlgCompanyMapper, HlgComp
 
 
     @Override
-    public List<HlgCompany> findAllCompanyListByOrgcode(String orgCode) {
-        return baseMapper.findAllCompanyListByOrgcode(orgCode);
+    public List<HlgCompany> findAllCompanyListByOrgcode(HlgCompany hlgCompany, String orgCode) {
+        return baseMapper.findAllCompanyListByOrgcode(hlgCompany, orgCode);
     }
 
 

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/util/RoleDataUtils.java

@@ -74,10 +74,10 @@ public class RoleDataUtils {
                 //查询当前平台的所有企业
                 queryWrapper.likeRight("sys_org_code", orgCode);
             }
-            List<HlgCompany> companyList = hlgCompanyService.list(queryWrapper);
-            for (HlgCompany hlgCompany : companyList) {
-                codeList.add(hlgCompany.getCompanyCode());
-            }
+        }
+        List<HlgCompany> companyList = hlgCompanyService.list(queryWrapper);
+        for (HlgCompany hlgCompany : companyList) {
+            codeList.add(hlgCompany.getCompanyCode());
         }
         return codeList;
     }