Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/constants/enums/dict/agreement/ValidStatus.java

@@ -14,11 +14,8 @@ import lombok.Getter;
 @Getter
 public enum ValidStatus {
 
-
-    VS_2("0", "无效", 1, 0),
-    VS_1("1", "有效", 2, 0),
-    VS_3("2", "待审核", 3, 0);
-
+    VS_1("1", "有效", 1, 0),
+    VS_2("0", "无效", 2, 0);
 
     // 编号
     private final String code;

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -324,14 +324,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public IPage<SysUser> selectUserPage(Page page, SysUser sysUser, String containsSubDept) {
         IPage<SysUser> sysUserIPage = baseMapper.selectUserPage(page, sysUser, containsSubDept);
         List<SysUser> records = sysUserIPage.getRecords();
-        List<String> ids = records.stream().map(SysUser::getId).collect(Collectors.toList());
-        LambdaQueryWrapper<SysUserTreeShowLevel> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SysUserTreeShowLevel::getUserId, ids);
-        List<SysUserTreeShowLevel> list = sysUserTreeShowLevelService.list(wrapper);
-        for (SysUser record : records) {
-            for (SysUserTreeShowLevel showLevel : list) {
-                if (record.getId().equals(showLevel.getUserId())) {
-                    record.setShowLevel(showLevel.getShowLevel());
+        if (records != null && records.size() > 0) {
+            List<String> ids = records.stream().map(SysUser::getId).collect(Collectors.toList());
+            LambdaQueryWrapper<SysUserTreeShowLevel> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(SysUserTreeShowLevel::getUserId, ids);
+            List<SysUserTreeShowLevel> list = sysUserTreeShowLevelService.list(wrapper);
+            for (SysUser record : records) {
+                for (SysUserTreeShowLevel showLevel : list) {
+                    if (record.getId().equals(showLevel.getUserId())) {
+                        record.setShowLevel(showLevel.getShowLevel());
+                    }
                 }
             }
         }

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -495,6 +495,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                     ptlAgreementProductCostsNewHistory.setCostsId(ptlAgreementProductCostsNew.getId());
                     //生成批次ID
                     String uuid = IdGenerate.nextId();
+                    ptlAgreementProductCostsNewHistory.setPriorityLevel(ptlAgreementProductCostsNew.getPriorityLevel());
                     ptlAgreementProductCostsNewHistory.setBatch(uuid);
                     ptlAgreementProductCostsNewHistory.setOperatorType("add");
                     ptlAgreementProductCostsNewHistory.setProductId(agreementProductCosts.getProductId().get(i));

src/main/resources/mapper/modules/protocol/PtlAgreementHistoryMapper.xml

@@ -79,7 +79,7 @@
         WHERE
             papcnh.agreement_id = #{agreementProductQueryVo.agreementId}
         <if test="agreementProductQueryVo.operatorType != null and agreementProductQueryVo.operatorType != ''">
-            AND iah.operator_type = #{agreementProductQueryVo.operatorType}
+            AND papcnh.operator_type = #{agreementProductQueryVo.operatorType}
         </if>
         <if test="agreementProductQueryVo.operator != null and agreementProductQueryVo.operator != ''">
             AND su.name = #{agreementProductQueryVo.operator}