1.修改bug

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -618,9 +618,9 @@ public class YgglController {
 			default:
 			default:
 				break;
 				break;
 			}
 			}
-			if (!isvalid) {
+			/*if (!isvalid) {
 				return ResultUtil.error("证件格式不对!");
 				return ResultUtil.error("证件格式不对!");
-			}
+			}*/
 			Integer jobType = ad.getJobType();
 			Integer jobType = ad.getJobType();
 			Date rzTime = ad.getRzTime() == null ? new Date() : ad.getRzTime();
 			Date rzTime = ad.getRzTime() == null ? new Date() : ad.getRzTime();
 			Integer syq = ad.getSyq();
 			Integer syq = ad.getSyq();

src/main/java/cn/timer/api/controller/zpgl/ZpglController.java

@@ -176,7 +176,7 @@ public class ZpglController {
             QueryWrapper<ZpglZwxx> queryWrapper = new QueryWrapper<>();
             QueryWrapper<ZpglZwxx> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(ZpglZwxx::getOrgCode, userBean.getOrgCode());
             queryWrapper.lambda().eq(ZpglZwxx::getOrgCode, userBean.getOrgCode());
             if (deleteFlag.intValue() == 1) {
             if (deleteFlag.intValue() == 1) {
-                queryWrapper.lambda().eq(ZpglZwxx::getDeleteFlag, 0);
+                queryWrapper.lambda().eq(ZpglZwxx::getDeleteFlag, 0).gt(ZpglZwxx::getEndTime,new Date());
             }
             }
             List<ZpglZwxx> zpglZwxxs = ZpglZwxx.builder().build().selectList(queryWrapper);
             List<ZpglZwxx> zpglZwxxs = ZpglZwxx.builder().build().selectList(queryWrapper);
             return ResultUtil.data(zpglZwxxs, "查询成功");
             return ResultUtil.data(zpglZwxxs, "查询成功");

src/main/resources/application-pro.yml

@@ -251,6 +251,14 @@ sftp:
     serverUrl: 'https://img.8timer.cn'
     serverUrl: 'https://img.8timer.cn'
     targetPath: '/disk'
     targetPath: '/disk'
     reservedName: false
     reservedName: false
+#微信公众号（服务号）
+wxgzh:
+  appid: 'wxd331ab19a67e2319'
+  appSecret: '31259f6fee0c0771d6f48c3d5159c551'
+  #我方token 在微信公众号基本配置里面配置（ token = 8timer123 md5加密得）
+  token: 'af37997effca937229453180e830b164'
+  #消息加解密密钥
+  encodingAesKey: 'chAbt69dLAtk8HH0oGMuZwHzK2SuhnxZI5Jbzc4nNzX'
 
 
 insure:
 insure:
   #投保
   #投保

src/main/resources/mapping/yggl/YgglMainEmpMapper.xml

@@ -236,6 +236,7 @@
 				</choose>
 				</choose>
         	</if>
         	</if>
         </where>
         </where>
+		GROUP BY a.id DESC
     </select>
     </select>
 
 
     <!-- benyueLz本月离职人数 -->
     <!-- benyueLz本月离职人数 -->