20241220 付费码管理

PCS/src/main/java/cn/cslg/permission/service/PersonnelService.java

@@ -840,8 +840,9 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
         Long size = personnelDTO.getSize();
         //获取登陆人信息
         PersonnelVO personnelVO1 = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
+        System.out.println("角色类型"+personnelVO1.getRoleType());
         // 代码控制若不是超级管理员则只能查看本租户的人员列表
-        if (personnelVO1.getRoleType() == null || personnelVO1.getRoleType() != 1||personnelVO1.getRoleType()!=3) {
+        if (personnelVO1.getRoleType() == null || (personnelVO1.getRoleType() != 1&&personnelVO1.getRoleType()!=3)) {
             personnelDTO.setTenant(personnelVO1.getTenantId());
         }
         if (current != null && size != null) {

PCS/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   servlet:
     context-path: /
-  port: 8880
+  port: 8123
 sa-token:
   activity-timeout: 18000
   token-name: token
@@ -23,7 +23,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: testNetIn
   jackson:
     default-property-inclusion: non_null
     serialization:

PCS/src/test/java/cn/cslg/permission/EncryptionPersonTest.java

@@ -34,8 +34,8 @@ public class EncryptionPersonTest {
     @Test
     public void test() throws Exception {
         EncryptionLoginDTO vo = new EncryptionLoginDTO();
-        vo.setUsername("admin");
-        vo.setPassword("xiaoshi221101");
+        vo.setUsername("weilinrui@china-wispro.com");
+        vo.setPassword("642541");
         vo.setAppKey("4e95e3d926a2a4befa5d913acc0aa9f5");
 //        vo.setMachineCode("BDACEARQ1241241");
         vo.setMachineCode("b4120f3606dfda03c341e8f8b1414ec3");