Merge remote-tracking branch 'origin/master'

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/service/impl/HlgPaymentServiceImpl.java

@@ -924,13 +924,13 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
             hlgPaymentDetailList = hlgPaymentDetailList1;
             List<HlgPaymentDetailExport> list1 = new ArrayList<HlgPaymentDetailExport>();
             list1.addAll(hlgPaymentDetailList);
-            Set<HlgPaymentDetailExport> set1 = new TreeSet<HlgPaymentDetailExport>((hwPaymentDetailExport1, hwPaymentDetailExport2) -> StringUtils.isNotBlank(hwPaymentDetailExport1.idcardNumber) && StringUtils.isNotBlank(hwPaymentDetailExport2.idcardNumber)?hwPaymentDetailExport1.idcardNumber.compareTo(hwPaymentDetailExport2.idcardNumber):1);
+            Set<HlgPaymentDetailExport> set1 = new TreeSet<HlgPaymentDetailExport>((hwPaymentDetailExport1, hwPaymentDetailExport2) -> StringUtils.isNotBlank(hwPaymentDetailExport1.idcardNumber) && StringUtils.isNotBlank(hwPaymentDetailExport2.idcardNumber) ? hwPaymentDetailExport1.idcardNumber.compareTo(hwPaymentDetailExport2.idcardNumber) : 1);
             set1.addAll(hlgPaymentDetailList);
             list1.removeAll(new ArrayList<>(set1));
 
             List<HlgPaymentDetailExport> list3 = new ArrayList<HlgPaymentDetailExport>();
             list3.addAll(hlgPaymentDetailList);
-            Set<HlgPaymentDetailExport> set2 = new TreeSet<HlgPaymentDetailExport>((hwPaymentDetailExport1, hwPaymentDetailExport2) -> StringUtils.isNotBlank(hwPaymentDetailExport1.getCardNumber()) && StringUtils.isNotBlank(hwPaymentDetailExport2.getCardNumber())?hwPaymentDetailExport1.getCardNumber().compareTo(hwPaymentDetailExport2.getCardNumber()):1);
+            Set<HlgPaymentDetailExport> set2 = new TreeSet<HlgPaymentDetailExport>((hwPaymentDetailExport1, hwPaymentDetailExport2) -> StringUtils.isNotBlank(hwPaymentDetailExport1.getCardNumber()) && StringUtils.isNotBlank(hwPaymentDetailExport2.getCardNumber()) ? hwPaymentDetailExport1.getCardNumber().compareTo(hwPaymentDetailExport2.getCardNumber()) : 1);
             set2.addAll(hlgPaymentDetailList);
             list3.removeAll(new ArrayList<>(set2));
             list3.removeAll(list1);
@@ -1480,6 +1480,10 @@ public class HlgPaymentServiceImpl extends ServiceImpl<HlgPaymentMapper, HlgPaym
         //获取当前登录用户
         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.paymentList;

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/service/impl/HlgUserServiceImpl.java

@@ -40,7 +40,7 @@ import java.util.*;
 /**
  * @Description: hlg_user
  * @Author: jeecg-boot
- * @Date:   2020-02-24
+ * @Date: 2020-02-24
  * @Version: V1.0
  */
 @Slf4j
@@ -56,6 +56,15 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
     @Override
     public Page<HlgUser> pageList(Integer pageNo, Integer pageSize, HlgUser hlgUser, HttpServletRequest request) {
         Page<HlgUser> page = new Page<HlgUser>();
+        //获取请求路由路径
+        String routeUrl = request.getServletPath();
+        //获取当前登录用户
+        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.userList;
@@ -69,6 +78,7 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
         parameters.put("lastPaymentCompany", hlgUser.getLastPaymentCompany());
         parameters.put("createTimeBegin", hlgUser.getCreateTime_begin());
         parameters.put("createTimeEnd", hlgUser.getCreateTime_end());
+        parameters.put("companyCodeList", companyCodeList);
         //数据加密
         String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
         JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);
@@ -77,13 +87,13 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
             if (jsonObject.getBoolean(HttpsContants.SUCCESS_FLAG)) {
                 log.info("用户列表===={}", jsonObject);
                 JSONObject jsonObject1 = jsonObject.getJSONObject("result");
-                List<Map<String, Object>> list = ( List<Map<String, Object>>) jsonObject1.get("records");
+                List<Map<String, Object>> list = (List<Map<String, Object>>) jsonObject1.get("records");
                 log.info("用户列表==={}", list);
-                List<HlgUser> list1=new ArrayList();
-                for (int i = 0; i <list.size() ; i++) {
-                    HlgUser hlgUser1=baseMapper.getUserByUserCode((String)list.get(i).get("userCode"));
-                    if(list.get(i).get("lastPaymentCompany")!=null){
-                        hlgUser1.setLastPaymentCompany((String)list.get(i).get("lastPaymentCompany"));
+                List<HlgUser> list1 = new ArrayList();
+                for (int i = 0; i < list.size(); i++) {
+                    HlgUser hlgUser1 = baseMapper.getUserByUserCode((String) list.get(i).get("userCode"));
+                    if (list.get(i).get("lastPaymentCompany") != null) {
+                        hlgUser1.setLastPaymentCompany((String) list.get(i).get("lastPaymentCompany"));
                     }
                     hlgUser1.setContractUpload((Integer) list.get(i).get("contractUpload"));
                     list1.add(hlgUser1);
@@ -141,7 +151,7 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
         if (hlgUserExportList.size() > 0) {
             List<HlgUserExport> list1 = new ArrayList<HlgUserExport>();
             list1.addAll(hlgUserExportList);
-            Set<HlgUserExport> set1 = new TreeSet<HlgUserExport>((hlgUserExport1, hlgUserExport2) -> StringUtils.isNotBlank(hlgUserExport1.idcardNumber) && StringUtils.isNotBlank(hlgUserExport2.idcardNumber)?hlgUserExport1.idcardNumber.compareTo(hlgUserExport2.idcardNumber):1);
+            Set<HlgUserExport> set1 = new TreeSet<HlgUserExport>((hlgUserExport1, hlgUserExport2) -> StringUtils.isNotBlank(hlgUserExport1.idcardNumber) && StringUtils.isNotBlank(hlgUserExport2.idcardNumber) ? hlgUserExport1.idcardNumber.compareTo(hlgUserExport2.idcardNumber) : 1);
             set1.addAll(hlgUserExportList);
             list1.removeAll(new ArrayList<>(set1));
 
@@ -150,7 +160,7 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
                 boolean bo = false;
                 Map map = new HashMap();//存放错误行数和错误原因
                 String name = hlgUserExportList.get(j).getName().trim();//姓名
-                String idcardNumber="";
+                String idcardNumber = "";
                 if (StringUtils.isNotBlank(hlgUserExportList.get(j).getIdcardNumber())) {
                     idcardNumber = hlgUserExportList.get(j).getIdcardNumber().trim();  //身份证号
                 }
@@ -184,9 +194,9 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
                     map.put("reason", "身份证号未填写");
                     resultlist.add(map);
                     continue;
-                }else{
-                    int countIdcardNumber=baseMapper.findCountIdcardNumberByIdcardNumber(idcardNumber);
-                    if(countIdcardNumber>0){
+                } else {
+                    int countIdcardNumber = baseMapper.findCountIdcardNumberByIdcardNumber(idcardNumber);
+                    if (countIdcardNumber > 0) {
                         map.put("id", j + 3);
                         map.put("idcardNumber", idcardNumber);
                         map.put("reason", "身份证号已存在");
@@ -213,7 +223,7 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
      */
     @Transactional(rollbackFor = Exception.class)
     public void saveHlgUser(List<HlgUserExport> hlgUserExportList) {
-        List<HlgUser>  list=new ArrayList();
+        List<HlgUser> list = new ArrayList();
         //获取当前登录用户
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         HlgPlatform hlgPlatform = hlgPlatformMapper.getByCode(sysUser.getOrgCode());
@@ -233,8 +243,8 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
         //同步慧盈
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.userAdd;
-        JSONObject jsonObject1=new JSONObject();
-        jsonObject1.put("list",list);
+        JSONObject jsonObject1 = new JSONObject();
+        jsonObject1.put("list", list);
         jsonObject1.put("businessBelongId", hlgPlatform.getBusinessBelongId());
         log.info("param============{}", JSONObject.toJSONString(jsonObject1));
         //数据加密
@@ -245,10 +255,10 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
             if (jsonObject.getBoolean("success")) {
                 log.info("用户-新增成功===={}", jsonObject);
                 //更新userCode
-                List<Map<String, Object>>  list1= (List<Map<String, Object>>) jsonObject.get("result");
-                for (int i = 0; i <list1.size() ; i++) {
-                    HlgUser hlgUser=getById(list1.get(i).get("userId").toString());
-                    hlgUser.setUserCode( list1.get(i).get("userCode").toString());
+                List<Map<String, Object>> list1 = (List<Map<String, Object>>) jsonObject.get("result");
+                for (int i = 0; i < list1.size(); i++) {
+                    HlgUser hlgUser = getById(list1.get(i).get("userId").toString());
+                    hlgUser.setUserCode(list1.get(i).get("userCode").toString());
                     updateById(hlgUser);
                 }
             } else {
@@ -263,16 +273,16 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void removeUserByIds( String ids) {
-        String [] arr=ids.split(",");
-        List<String> idsList=new ArrayList<>();
-        for (int i = 0; i <arr.length ; i++) {
-          List<String> list=hlgUserSubcontractMapper.getByUserId(arr[i]);
-          if(list.size()>0){
-              idsList.addAll(list);
-          }
+    public void removeUserByIds(String ids) {
+        String[] arr = ids.split(",");
+        List<String> idsList = new ArrayList<>();
+        for (int i = 0; i < arr.length; i++) {
+            List<String> list = hlgUserSubcontractMapper.getByUserId(arr[i]);
+            if (list.size() > 0) {
+                idsList.addAll(list);
+            }
         }
-        if (idsList.size()>0) {
+        if (idsList.size() > 0) {
             hlgUserSubcontractService.removeByIds(idsList);
         }
         removeByIds(Arrays.asList(ids.split(",")));
@@ -289,10 +299,10 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
         //同步慧盈
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.userAdd;
-        List<HlgUser>  list=new ArrayList();
+        List<HlgUser> list = new ArrayList();
         list.add(hlgUser);
-        JSONObject jsonObject1=new JSONObject();
-        jsonObject1.put("list",list);
+        JSONObject jsonObject1 = new JSONObject();
+        jsonObject1.put("list", list);
         jsonObject1.put("businessBelongId", hlgPlatform.getBusinessBelongId());
         log.info("param============{}", JSONObject.toJSONString(jsonObject1));
         //数据加密
@@ -303,8 +313,8 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
             if (jsonObject.getBoolean("success")) {
                 log.info("用户-新增成功===={}", jsonObject);
                 //更新userCode
-                List<Map<String, Object>>  list1= (List<Map<String, Object>>) jsonObject.get("result");
-                for (int i = 0; i <list1.size() ; i++) {
+                List<Map<String, Object>> list1 = (List<Map<String, Object>>) jsonObject.get("result");
+                for (int i = 0; i < list1.size(); i++) {
                     hlgUser.setUserCode((String) list1.get(i).get("userCode"));
                     updateById(hlgUser);
                 }
@@ -324,7 +334,7 @@ public class HlgUserServiceImpl extends ServiceImpl<HlgUserMapper, HlgUser> impl
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         hlgUser.setUpdateBy(sysUser.getUsername());
         updateById(hlgUser);
-        HlgUser hlgUser1 =getById(hlgUser.getId());
+        HlgUser hlgUser1 = getById(hlgUser.getId());
         //同步慧盈
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.userEdit;