Просмотр исходного кода

1、修改新建员工的判断

zhoux 1 год назад
Родитель
Сommit
0f97fe7005
1 измененных файлов с 33 добавлено и 3 удалено
  1. 33 3
      src/main/java/com/dk/mdm/service/mst/StaffService.java

+ 33 - 3
src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -135,9 +135,38 @@ public class StaffService extends BaseService<Staff> {
         }
 //        Map<String, Object> map = new HashMap<>();
 //        map.put("grade_code", "STD");
-//        map.put("end_date", "2099-09-01");
-//        map.put("user_end_date", "2025-04-01");
-//        map.put("wx_max_num", 3);
+//        map.put("end_date", "2099-12-31");
+////        map.put("user_end_date", "2025-04-01");
+//        map.put("wx_max_num", 20);
+////        map.put("web_max_num", 20);
+//        List<Map<String,Object>> mapList = new ArrayList<>();
+//        Map<String,Object> map1 = new HashMap<>();
+//        List<String> funList = new ArrayList<>();
+//        funList.add("45adf0c1-cb1d-4baa-8cd0-9cefe5649687");
+//        funList.add("af9fe752-9431-4301-907a-ebee6f1d01bd");
+//        funList.add("a577397a-78b9-475d-b44a-92294a4ac5a7");
+//        funList.add("0b95fe60-add2-4177-9cab-6bd936aac090");
+//        funList.add("5f415229-e64c-4e88-b9c4-72a661b56d64");
+//        funList.add("3644ebc5-fde2-44fc-bba8-9adc91ccb483");
+//        funList.add("f2f912f4-dad3-42ca-9835-184de6ecf27b");
+//        map1.put("activityId","10002024-0701-0000-0000-0000052aaec4");
+//        map1.put("funUuids",funList);
+//        mapList.add(map1);
+//        Map<String,Object> map2 = new HashMap<>();
+//        List<String> funList2 = new ArrayList<>();
+//        funList2.add("851e952a-27c6-42d2-91ad-097e266f63ea");
+//        map2.put("activityId","10002024-0701-0000-0000-0000052aaec3");
+//        map2.put("funUuids",funList2);
+//        mapList.add(map2);
+//        Map<String,Object> map3 = new HashMap<>();
+//        List<String> funList3 = new ArrayList<>();
+//        funList3.add("3e43dc4c-0e98-49ca-8ca4-2fe47f286e1d");
+//        funList3.add("1b3ce29f-f7d6-40c0-9ca5-754ff8e85db6");
+//        funList3.add("67df7456-3deb-41de-a6db-f916eae66089");
+//        map3.put("activityId","10002024-0701-0000-0000-0000052aaec3");
+//        map3.put("funUuids",funList3);
+//        mapList.add(map3);
+//        map.put("fun_package",mapList);
 //        String s1 = JSON.toJSONString(map);
 //        // 加密
 //        String s = AESUtil.aesEncrypt(s1);
@@ -198,6 +227,7 @@ public class StaffService extends BaseService<Staff> {
                 }
                 staffQuery = new StaffQuery();
                 staffQuery.setFlgCanLogin(true);
+                staffQuery.setFlgValid(true);
                 staffQuery.setCpId(cpId);
                 List<StaffResponse> staffResponsesFlgCanLogin = staffMapper.selectByCond(staffQuery);
                 if (staffResponsesFlgCanLogin != null && staffResponsesFlgCanLogin.size() > 0) {