Browse Source

修改人员筛选离职与否

lwx_dev
erdanergou 2 years ago
parent
commit
69f9830c33
  1. 4
      src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
  2. 8
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 12
      src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
  4. 4
      src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
  5. 20
      src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

4
src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java

@ -123,6 +123,10 @@ public class PublicConfig {
if (position != null) { if (position != null) {
List<UserByPort> allUserByMainDepartment = FindUserByAdminorg(maindepartment, userKey, userToken); List<UserByPort> allUserByMainDepartment = FindUserByAdminorg(maindepartment, userKey, userToken);
for (UserByPort userByPort : allUserByMainDepartment) { for (UserByPort userByPort : allUserByMainDepartment) {
int emptype = userByPort.getEmptype();
if(emptype>10){
continue;
}
if (Integer.compare(userByPort.getPosition(), position.getId()) == 0) { if (Integer.compare(userByPort.getPosition(), position.getId()) == 0) {
userByPortList.add(userByPort); userByPortList.add(userByPort);
} }

8
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@ -2773,6 +2773,10 @@ public class PageController {
continue; continue;
} }
UserByPort manager = PublicConfig.findUserByPortByNumber(s); UserByPort manager = PublicConfig.findUserByPortByNumber(s);
int emptype = manager.getEmptype();
if (emptype > 10) {
continue;
}
managerName.append(manager.getName()).append(","); managerName.append(manager.getName()).append(",");
} }
stp.setDepartmentManagerName(managerName.toString()); stp.setDepartmentManagerName(managerName.toString());
@ -2851,6 +2855,10 @@ public class PageController {
continue; continue;
} }
UserByPort manager = PublicConfig.findUserByPortByNumber(s); UserByPort manager = PublicConfig.findUserByPortByNumber(s);
int emptype = manager.getEmptype();
if (emptype > 10) {
continue;
}
managerName.append(manager.getName()).append(","); managerName.append(manager.getName()).append(",");
} }
stp.setDepartmentManagerName(managerName.toString()); stp.setDepartmentManagerName(managerName.toString());

12
src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java

@ -78,6 +78,10 @@ public class StockTakingController {
continue; continue;
} }
UserByPort departmentManager = PublicConfig.findUserByPortByNumber(s); UserByPort departmentManager = PublicConfig.findUserByPortByNumber(s);
int emptype = departmentManager.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = departmentManager.getWorkwechat(); String workwechat = departmentManager.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentManager.getWechat(); workwechat = departmentManager.getWechat();
@ -291,6 +295,7 @@ public class StockTakingController {
/** /**
* 用于暂存当前盘点记录 * 用于暂存当前盘点记录
*
* @param map 存储数据 * @param map 存储数据
* @param request * @param request
*/ */
@ -314,6 +319,7 @@ public class StockTakingController {
/** /**
* 用于删除暂存盘点记录 * 用于删除暂存盘点记录
*
* @param map 删除数据 * @param map 删除数据
* @param request * @param request
*/ */
@ -331,7 +337,6 @@ public class StockTakingController {
} }
/** /**
* 获取当前用户当前库存的盘点记录 * 获取当前用户当前库存的盘点记录
* *
@ -361,6 +366,7 @@ public class StockTakingController {
/** /**
* 用于提交申请 * 用于提交申请
*
* @param map 提交的数据 * @param map 提交的数据
* @param request * @param request
* @return * @return
@ -448,6 +454,10 @@ public class StockTakingController {
continue; continue;
} }
UserByPort departmentManager = PublicConfig.findUserByPortByNumber(s); UserByPort departmentManager = PublicConfig.findUserByPortByNumber(s);
int emptype = departmentManager.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = departmentManager.getWorkwechat(); String workwechat = departmentManager.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentManager.getWechat(); workwechat = departmentManager.getWechat();

4
src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java

@ -3112,6 +3112,10 @@ public class QyWxOperationService {
} }
// 获取负责人信息 // 获取负责人信息
UserByPort userByPort = PublicConfig.findUserByPortByNumber(manager); UserByPort userByPort = PublicConfig.findUserByPortByNumber(manager);
int emptype = userByPort.getEmptype();
if (emptype > 10) {
continue;
}
Map<String, String> contact_principal = new HashMap<>(); Map<String, String> contact_principal = new HashMap<>();
String workwechat1 = userByPort.getWorkwechat(); String workwechat1 = userByPort.getWorkwechat();
if (workwechat1 == null || "".equals(workwechat1)) { if (workwechat1 == null || "".equals(workwechat1)) {

20
src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

@ -430,6 +430,10 @@ public class StockTakingServiceImpl implements StockTakingService {
continue; continue;
} }
UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); UserByPort userByPort = PublicConfig.findUserByPortByNumber(s);
int emptype = userByPort.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = userByPort.getWorkwechat(); String workwechat = userByPort.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
@ -609,6 +613,10 @@ public class StockTakingServiceImpl implements StockTakingService {
continue; continue;
} }
UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); UserByPort userByPort = PublicConfig.findUserByPortByNumber(s);
int emptype = userByPort.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = userByPort.getWorkwechat(); String workwechat = userByPort.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
@ -660,6 +668,10 @@ public class StockTakingServiceImpl implements StockTakingService {
continue; continue;
} }
UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); UserByPort userByPort = PublicConfig.findUserByPortByNumber(s);
int emptype = userByPort.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = userByPort.getWorkwechat(); String workwechat = userByPort.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
@ -1653,6 +1665,10 @@ public class StockTakingServiceImpl implements StockTakingService {
continue; continue;
} }
UserByPort userByPort1 = PublicConfig.findUserByPortByNumber(s); UserByPort userByPort1 = PublicConfig.findUserByPortByNumber(s);
int emptype = userByPort1.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = userByPort1.getWorkwechat(); String workwechat = userByPort1.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort1.getWechat(); workwechat = userByPort1.getWechat();
@ -1721,6 +1737,10 @@ public class StockTakingServiceImpl implements StockTakingService {
continue; continue;
} }
UserByPort userByPort = PublicConfig.findUserByPortByNumber(s); UserByPort userByPort = PublicConfig.findUserByPortByNumber(s);
int emptype = userByPort.getEmptype();
if (emptype > 10) {
continue;
}
String workwechat = userByPort.getWorkwechat(); String workwechat = userByPort.getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();

Loading…
Cancel
Save