master
wangning 8 years ago
parent 1e380cc65a
commit 759c752455

@ -3130,8 +3130,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
result.put("contract_info", config.getString("sys_contract_ordinary_info")); result.put("contract_info", config.getString("sys_contract_ordinary_info"));
} }
return result; return result;
} } else {
if (!(PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER)) { result.put("contract_info", config.getString("sys_contract_info"));
result.put("is_ordinary", false); result.put("is_ordinary", false);
if (!expire && waring) { if (!expire && waring) {
String[] key = { result.getString("expire_days") }; String[] key = { result.getString("expire_days") };
@ -3140,14 +3140,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
if (expire) { if (expire) {
result.put("contract_info", config.getString("sys_contract_info")); result.put("contract_info", config.getString("sys_contract_info"));
} }
return result;
}
JSONObject file = clientContractService.getOrGenerateSourceAgreement(account.getIntValue("client_id")); JSONObject file = clientContractService.getOrGenerateSourceAgreement(account.getIntValue("client_id"));
result.put("file_url", file.getString("file_value")); result.put("file_url", file.getString("file_value"));
result.put("contract_info", config.getString("sys_contract_info"));
return result; return result;
} }
}
private String editContractOrdinaryWaring(String[] key, String sourceStr) { private String editContractOrdinaryWaring(String[] key, String sourceStr) {
if (StringUtils.isEmpty(sourceStr) || ArrayUtils.isEmpty(key)) { if (StringUtils.isEmpty(sourceStr) || ArrayUtils.isEmpty(key)) {
return ""; return "";

Loading…
Cancel
Save