diff --git a/main/java/shjh/jhzj7/fi/fi/common/JHSSOAuthHandler.java b/main/java/shjh/jhzj7/fi/fi/common/JHSSOAuthHandler.java index d7735b0..4f54804 100644 --- a/main/java/shjh/jhzj7/fi/fi/common/JHSSOAuthHandler.java +++ b/main/java/shjh/jhzj7/fi/fi/common/JHSSOAuthHandler.java @@ -25,6 +25,8 @@ public class JHSSOAuthHandler implements ThirdSSOAuthHandler { private String callBackUrl = System.getProperty("domain.contextUrl"); + private static final String[] projectgroups = new String[]{"mahongqiang","xujianbiao","anchenyuan","yuxueliang","weiyunlong","liguiqiang"}; + @Override public void callTrdSSOLogin(HttpServletRequest hsrequest, HttpServletResponse hsresponse, String backUrl) { //backUrl 系统已构建好回调地址,二开无需处理 @@ -63,8 +65,12 @@ public class JHSSOAuthHandler implements ThirdSSOAuthHandler { String numOrName = getWorkerNumberOrUseName(hsrequest);//此逻辑需二开实现 if(StringUtils.isNotEmpty(numOrName)){ //当前返回类型手机,用户名,邮箱、工号 -// result.setUserType(UserProperType.WorkerNumber); - result.setUserType(UserProperType.UserName); + //查看返回值是不是我们项目组的人员,如果是,得使用用户名登录,否则用工号 + if(isprojectgroup(numOrName)){ + result.setUserType(UserProperType.UserName); + }else{ + result.setUserType(UserProperType.WorkerNumber); + } //用户信息标识 result.setUser(numOrName); result.setSucess(true); @@ -73,6 +79,17 @@ public class JHSSOAuthHandler implements ThirdSSOAuthHandler { return result; } + private boolean isprojectgroup(String numOrName){ + boolean result = false; + for (String projectgroup : projectgroups) { + if(projectgroup.equals(numOrName)){ + result = true; + break; + } + } + return result; + } + private String getWorkerNumberOrUseName(HttpServletRequest hsrequest){ //第二步:SSO认证系统会携带临时code浏览器重定向至应用方回调地址,直接从请求中获取code String tempCode = hsrequest.getParameter("code"); diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java b/main/java/shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java index 5b781d1..2fd64f1 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/task/PersonCustomerBankTask.java @@ -52,9 +52,15 @@ public class PersonCustomerBankTask extends AbstractTask implements Plugin { return; } DynamicObjectCollection doc_bank = currentCus.getDynamicObjectCollection("entry_bank"); - if(!doc_bank.isEmpty()){ - //只处理新增 - return; + DynamicObject bankinfo; + if(doc_bank.isEmpty()){ + //只处理新增或者开户银行为空的记录 + bankinfo = doc_bank.addNew(); + }else{ + bankinfo = doc_bank.get(0); + if(bankinfo.getDynamicObject("bank") != null){ + return; + } } String xxyh = ups.getString("shjh_xxyh");//详细分机银行 String skyh = ups.getString("shjh_skyh");//收款银行 @@ -75,7 +81,6 @@ public class PersonCustomerBankTask extends AbstractTask implements Plugin { } } String cusname = ups.getString("name");//姓名 - DynamicObject bankinfo = doc_bank.addNew(); bankinfo.set("isdefault_bank",true); bankinfo.set("bankaccount",acctnum);//银行账号 bankinfo.set("accountname",cusname);//账户名称