Merge remote-tracking branch 'origin/master'

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml

@@ -34,10 +34,10 @@ spring:
 #  merchant-serial-path: /Users/dengzhangchen/Desktop/backups/pay/cert/apiclient_cert.p12
 #  spbill-create-ip: 59.202.170.152
 
-ali-pay:
-  app-id: 2021005157648588
-  private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDa2GemYsE0HExDX8tEu7kt3cVPkPyJPgZklkyMmpI1uTBsA8qcKBoS88feD/Q+f3s6etGoBxTiln3vBVZBMGGwpL8bcxGu1ILcea8PBOsKfdRFF6wN4DsLtVL+6O2kK9SDOqZkQt/bEVE3tXljxtQ+igU0raZWISQXWCwekyzg4CQLfMBoJj0/JF4Zpiw2dYvBRKgEnR8H7pzCARJuN7B3G4NWrfyRyFn6+i+oDmFcwD2ewwQ8gX9He7mqgn+/ciLRgm/yh0orKKfECFfQUH3tZVW59QU7YAXtyPdpTGCptZkM5prh9bCGVKoOn7S05FRyUJxRD9dEen8pyVMOhSMRAgMBAAECggEAfrHsB7qCaZ28VQD/V9JqGXCbiz2/xeB/qPoOZRQTc0C8FLx5LsBUoAY7/oYz+36oI6n4+JLo92jyjU8EqYbN94rZDJYodZOYEvXrcAGD5TYFjt5ugDYBWPzniKXm9jVduX9Z1w+UM2oqH9tS5H22YGJdMysY8iILl+w21piT0bc+yHPhaKuEVbeTVtf3F7F4MXDgfF1NQ5GEpUpSW0oqkEloVSZ1mpecnJ+AwfUUdogYgW91qxxGVY9+SapEFFoK1TnUwRFMXIC+aBLT8RQZA2t+0oCbvz1r95Vu115bZYWpqWCLs3y/0LeVpC7KeL6evN/s27FA96zPJ/fd4azrdQKBgQD+AC3szrCiq2kYGn5OEbrp6l4K8F7UuY8HCWiYisIZf3524r4sBXkeKSHkaRDXvKiu6CuznSHamZiR9L28KFxQDUFvX5aZ8tmN5UXDmY7BdeLjpFz8mkyndY02fox8A4D4TtTgwJUYjFRG0Mnraoi7adEmwl6xocxJokFLkltDnwKBgQDckWLagUcKYOlNocAkQ4973bxC2+sLWsNPC1FlQEdWfJ+g8bAdaAxHVfae3Mp/gBDDPolJW8yyeockmTQW+eKp9P+x8QETH5zzxO++0ucn/RUxAajOTLZ6MAcUxiTgBzRiPeVSi5qjiBV2v+Z2FDQFgalougCUKDKscFxlNVabTwKBgQD75G+m9b9EQxtBFR0HDRxBV/SVgpV4/uBxyQnapVkickaXXfvcqjzYBVCgNPXIDUd31bVpNb5aDJK6xGzZSWlq1gp7id9Pov/PcX0DIqjpAKDWwqyYseis9a3qSgvF/K+NEJian0H9C0WUyQBGH+ujeKg7eOzx2hQ/PdLlQCqT3wKBgHl3SyQfy3qIshKBgCm4Vv0UuEdtirwfCK2wAuwqgN69FL9yOdWH5jMmwQDtgErEwPZ0qvAOMOUdGu1pvUjl5hBIjsN0gG4Cm9GW45yH0qqv8gqh6k9p6ZfSeSPUlpwU+6Eaiv5xSQDDwWY6+fSO3bMmm5/DxuvQU0+pNQi7Xe17AoGADeD3zYf1/XtlmwsVEdA/UhsXitntvB9fRlOcjE0LYif6liHrwo1AG+8taMZ3wQ7E834/plM92ZBnrgwFWc5yAqr5b9RJ72cTOVcnMpLD5w83C+SuUtU71awfBuZ7KPTGzV1coa/JTGKlIAlgCJEPktC90cGuPFLHq993UDSkzrA=
-  public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2thnpmLBNBxMQ1/LRLu5Ld3FT5D8iT4GZJZMjJqSNbkwbAPKnCgaEvPH3g/0Pn97OnrRqAcU4pZ97wVWQTBhsKS/G3MRrtSC3HmvDwTrCn3URResDeA7C7VS/ujtpCvUgzqmZELf2xFRN7V5Y8bUPooFNK2mViEkF1gsHpMs4OAkC3zAaCY9PyReGaYsNnWLwUSoBJ0fB+6cwgESbjewdxuDVq38kchZ+vovqA5hXMA9nsMEPIF/R3u5qoJ/v3Ii0YJv8odKKyinxAhX0FB97WVVufUFO2AF7cj3aUxgqbWZDOaa4fWwhlSqDp+0tORUclCcUQ/XRHp/KclTDoUjEQIDAQAB
-  alipay-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqnCB+N172m5gxf1Rolfx5LErSiVwQCh0XQdDrVy6aTuVF5EtdqahSHtADyEPsBWudMBhzCfqpoZvfnvH7a+PED6uZ3DoXt7ETh8TmNM5yc+WTnD8pSphQvuHDJ3zMks489KNxiX6sXag71k9H1MXklJGPOUaljHqy/QlRn2ZLT7pFgaFH9LEcVoQBPIOurUn95078h848RFD30jZFW3fakxUGAGVVZaHH62z5OEWOmcA+CwxsEDMa1XMt02RGXgAAq4WOj+BqOGiFmhM8rnrUMchTyvx4umOzGvbF2Y9irN3aBZ5lfg+bzYcJpIOMzlM/V00LnEWzCblJzXNyH4hJQIDAQAB
-  callback-url: https://rj4jv5rwqs.by.takin.cc/hard/hard-ali-pay/callback
-  # callback-url: https://stgl.pj.gov.cn/api/hard/hard-ali-pay/callback
+#ali-pay:
+#  app-id: 2021005157648588
+#  private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDa2GemYsE0HExDX8tEu7kt3cVPkPyJPgZklkyMmpI1uTBsA8qcKBoS88feD/Q+f3s6etGoBxTiln3vBVZBMGGwpL8bcxGu1ILcea8PBOsKfdRFF6wN4DsLtVL+6O2kK9SDOqZkQt/bEVE3tXljxtQ+igU0raZWISQXWCwekyzg4CQLfMBoJj0/JF4Zpiw2dYvBRKgEnR8H7pzCARJuN7B3G4NWrfyRyFn6+i+oDmFcwD2ewwQ8gX9He7mqgn+/ciLRgm/yh0orKKfECFfQUH3tZVW59QU7YAXtyPdpTGCptZkM5prh9bCGVKoOn7S05FRyUJxRD9dEen8pyVMOhSMRAgMBAAECggEAfrHsB7qCaZ28VQD/V9JqGXCbiz2/xeB/qPoOZRQTc0C8FLx5LsBUoAY7/oYz+36oI6n4+JLo92jyjU8EqYbN94rZDJYodZOYEvXrcAGD5TYFjt5ugDYBWPzniKXm9jVduX9Z1w+UM2oqH9tS5H22YGJdMysY8iILl+w21piT0bc+yHPhaKuEVbeTVtf3F7F4MXDgfF1NQ5GEpUpSW0oqkEloVSZ1mpecnJ+AwfUUdogYgW91qxxGVY9+SapEFFoK1TnUwRFMXIC+aBLT8RQZA2t+0oCbvz1r95Vu115bZYWpqWCLs3y/0LeVpC7KeL6evN/s27FA96zPJ/fd4azrdQKBgQD+AC3szrCiq2kYGn5OEbrp6l4K8F7UuY8HCWiYisIZf3524r4sBXkeKSHkaRDXvKiu6CuznSHamZiR9L28KFxQDUFvX5aZ8tmN5UXDmY7BdeLjpFz8mkyndY02fox8A4D4TtTgwJUYjFRG0Mnraoi7adEmwl6xocxJokFLkltDnwKBgQDckWLagUcKYOlNocAkQ4973bxC2+sLWsNPC1FlQEdWfJ+g8bAdaAxHVfae3Mp/gBDDPolJW8yyeockmTQW+eKp9P+x8QETH5zzxO++0ucn/RUxAajOTLZ6MAcUxiTgBzRiPeVSi5qjiBV2v+Z2FDQFgalougCUKDKscFxlNVabTwKBgQD75G+m9b9EQxtBFR0HDRxBV/SVgpV4/uBxyQnapVkickaXXfvcqjzYBVCgNPXIDUd31bVpNb5aDJK6xGzZSWlq1gp7id9Pov/PcX0DIqjpAKDWwqyYseis9a3qSgvF/K+NEJian0H9C0WUyQBGH+ujeKg7eOzx2hQ/PdLlQCqT3wKBgHl3SyQfy3qIshKBgCm4Vv0UuEdtirwfCK2wAuwqgN69FL9yOdWH5jMmwQDtgErEwPZ0qvAOMOUdGu1pvUjl5hBIjsN0gG4Cm9GW45yH0qqv8gqh6k9p6ZfSeSPUlpwU+6Eaiv5xSQDDwWY6+fSO3bMmm5/DxuvQU0+pNQi7Xe17AoGADeD3zYf1/XtlmwsVEdA/UhsXitntvB9fRlOcjE0LYif6liHrwo1AG+8taMZ3wQ7E834/plM92ZBnrgwFWc5yAqr5b9RJ72cTOVcnMpLD5w83C+SuUtU71awfBuZ7KPTGzV1coa/JTGKlIAlgCJEPktC90cGuPFLHq993UDSkzrA=
+#  public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2thnpmLBNBxMQ1/LRLu5Ld3FT5D8iT4GZJZMjJqSNbkwbAPKnCgaEvPH3g/0Pn97OnrRqAcU4pZ97wVWQTBhsKS/G3MRrtSC3HmvDwTrCn3URResDeA7C7VS/ujtpCvUgzqmZELf2xFRN7V5Y8bUPooFNK2mViEkF1gsHpMs4OAkC3zAaCY9PyReGaYsNnWLwUSoBJ0fB+6cwgESbjewdxuDVq38kchZ+vovqA5hXMA9nsMEPIF/R3u5qoJ/v3Ii0YJv8odKKyinxAhX0FB97WVVufUFO2AF7cj3aUxgqbWZDOaa4fWwhlSqDp+0tORUclCcUQ/XRHp/KclTDoUjEQIDAQAB
+#  alipay-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqnCB+N172m5gxf1Rolfx5LErSiVwQCh0XQdDrVy6aTuVF5EtdqahSHtADyEPsBWudMBhzCfqpoZvfnvH7a+PED6uZ3DoXt7ETh8TmNM5yc+WTnD8pSphQvuHDJ3zMks489KNxiX6sXag71k9H1MXklJGPOUaljHqy/QlRn2ZLT7pFgaFH9LEcVoQBPIOurUn95078h848RFD30jZFW3fakxUGAGVVZaHH62z5OEWOmcA+CwxsEDMa1XMt02RGXgAAq4WOj+BqOGiFmhM8rnrUMchTyvx4umOzGvbF2Y9irN3aBZ5lfg+bzYcJpIOMzlM/V00LnEWzCblJzXNyH4hJQIDAQAB
+#  callback-url: https://rj4jv5rwqs.by.takin.cc/hard/hard-ali-pay/callback
+#  # callback-url: https://stgl.pj.gov.cn/api/hard/hard-ali-pay/callback

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java

@@ -19,6 +19,7 @@
 
 package com.bsd.pjcloud.admin.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.bsd.pjcloud.admin.api.dto.DeptAllListDto;
 import com.bsd.pjcloud.admin.api.entity.SysDept;
 import com.bsd.pjcloud.admin.api.vo.DeptExcelVO;
@@ -31,10 +32,13 @@ import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.annotation.HasPermission;
 import com.bsd.pjcloud.common.security.annotation.Inner;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -56,6 +60,7 @@ import java.util.Map;
 @RequestMapping("/dept")
 @Tag(description = "dept", name = "部门管理模块")
 @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+@Slf4j
 public class SysDeptController {
 
     private final SysDeptService sysDeptService;
@@ -89,14 +94,24 @@ public class SysDeptController {
      */
     @GetMapping(value = "/tree")
     public R getTree(String deptName, Long parentId) {
+        Long deptId = null;
+        try {
+            PjcloudUser user = SecurityUtils.getUser();
+            deptId = user.getDeptId();
+        } catch (Exception e) {
+            log.error("获取当前用户ID异常", e);
+        }
+        if (ObjectUtil.isEmpty(parentId)) {
+            parentId = deptId;
+        }
         return R.ok(sysDeptService.selectTree(deptName, parentId));
     }
 
 
     /**
-     *
      * 查询所有，无权限过滤
      * simpleTree
+     *
      * @param deptName
      * @param parentId
      * @return

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java

@@ -133,9 +133,15 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      */
     @Override
     public List<Tree<Long>> selectTree(String deptName, Long parentId) {
-        // 查询全部部门
-        List<SysDept> deptAllList = deptMapper
-                .selectList(Wrappers.<SysDept>lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName));
+        List<SysDept> deptAllList = new ArrayList<>();
+        if (ObjectUtil.isEmpty(parentId)) {
+            // 查询全部部门
+            deptAllList = deptMapper
+                    .selectList(Wrappers.<SysDept>lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName));
+        } else {
+            deptAllList = listDescendant(parentId);
+        }
+
         // 查询数据权限内部门
         List<Long> deptOwnIdList = deptMapper
                 .selectListByScope(
@@ -173,7 +179,12 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
                 return tree;
             }).collect(Collectors.toList());
         }
-
+        if (ObjectUtil.isNotEmpty(parentId)) {
+            SysDept parentDept = getById(parentId);
+            if (ObjectUtil.isNotEmpty(parentDept) && ObjectUtil.isNotEmpty(parentDept.getParentId())) {
+                parentId = parentDept.getParentId();
+            }
+        }
         return TreeUtil.build(collect, parentId == null ? 0 : parentId);
     }