|
|
@@ -358,7 +358,7 @@ public class PushMember {
|
|
|
} else { // 教职工
|
|
|
if (member.getMinOutSchool() != null) {
|
|
|
// 非 null， 1在职 0离线
|
|
|
- org.append("1".equals(member.getMinOutSchool()) ? "/教职工" : "/教职工/离职员工");
|
|
|
+ org.append("1".equals(member.getMinOutSchool()) ? "/教职工" : "/离职员工");
|
|
|
// if ("1".equals(member.getMinOutSchool())) {
|
|
|
// org.append("/教职工");
|
|
|
// } else {
|
|
|
@@ -545,6 +545,7 @@ public class PushMember {
|
|
|
// 只需要更新编号
|
|
|
requestBody.put("serial_number", member.getMcardNumber());
|
|
|
}
|
|
|
+ member.setMorganization(requestBody.get("organization"));
|
|
|
// ===============================================================================
|
|
|
// 调用创建用户接口，执行推送
|
|
|
ResponseEntity<String> stringResponseEntity = HttpRequestUtils.httpPost(URL, requestBody, queryParams);
|
|
|
@@ -570,9 +571,9 @@ public class PushMember {
|
|
|
int updateCount = updateLocalTable(status, member);
|
|
|
if (updateCount > 0) {
|
|
|
// if (cardNumber.length() == 14 && Integer.parseInt(cardNumber.substring(0, 4)) >= 2021) {
|
|
|
-// myWriter.writeToFile(action + "成员推送成功," + member.getMidCard() + "|" + member.getMname() + "|" + requestBody.get("organization") + "|" + member.getMidCard(), "ok");
|
|
|
+// myWriter.writeToFile(action + "成员推送成功," + member.getMidCard() + "|" + member.getMname() + "|" + member.getMorganization() + "|" + member.getMidCard(), "ok");
|
|
|
// } else {
|
|
|
- myWriter.writeToFile(action + "成员推送成功," + cardNumber + "|" + member.getMname() + "|" + requestBody.get("organization") + "|" + member.getMidCard(), "ok");
|
|
|
+ myWriter.writeToFile(action + "成员推送成功," + cardNumber + "|" + member.getMname() + "|" + member.getMorganization() + "|" + member.getMidCard(), "ok");
|
|
|
// }
|
|
|
} else {
|
|
|
myWriter.writeToFile(action + "成员推送失败," + member.getMcardNumber() + "|" + member.getMidCard(), "");
|
soft5566