Commit 45917e05 authored by zhangyingbin's avatar zhangyingbin

修改变更

parent f9d50579
...@@ -131,7 +131,7 @@ public class OrgServiceImpl { ...@@ -131,7 +131,7 @@ public class OrgServiceImpl {
orgUsr.setOrgExpandAttr1(jsonObject.getString("type")); orgUsr.setOrgExpandAttr1(jsonObject.getString("type"));
orgUsr.setBizOrgCode(jsonObject.getString("creditCode")); orgUsr.setBizOrgCode(jsonObject.getString("creditCode"));
} }
if (OrgEnum.人员.getKey().equals(bizOrgType)){ if (OrgEnum.普通人员.getKey().equals(bizOrgType)){
if (1==jsonObject.getInteger("isWelder")) { if (1==jsonObject.getInteger("isWelder")) {
orgUsr.setOrgExpandAttr1(OrgEnum.焊工.getKey()); orgUsr.setOrgExpandAttr1(OrgEnum.焊工.getKey());
orgUsr.setCode(getCode()); orgUsr.setCode(getCode());
...@@ -260,7 +260,7 @@ public class OrgServiceImpl { ...@@ -260,7 +260,7 @@ public class OrgServiceImpl {
wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr())); wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
LambdaQueryWrapper<OrgUsr> personWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrgUsr> personWrapper = new LambdaQueryWrapper<>();
personWrapper.eq(OrgUsr::getParentId,orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()) personWrapper.eq(OrgUsr::getParentId,orgUsrServiceImpl.getOne(wrapper).getSequenceNbr())
.eq(OrgUsr :: getBizOrgType,OrgEnum.人员.getKey()); .eq(OrgUsr :: getBizOrgType,OrgEnum.普通人员.getKey());
return orgUsrServiceImpl.list(personWrapper); return orgUsrServiceImpl.list(personWrapper);
} }
...@@ -306,7 +306,7 @@ public class OrgServiceImpl { ...@@ -306,7 +306,7 @@ public class OrgServiceImpl {
OrgUsr orgUsr = getOrgUsrById(sequenceNbr); OrgUsr orgUsr = getOrgUsrById(sequenceNbr);
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.like(OrgUsr :: getBizOrgCode,orgUsr.getBizOrgCode()) wrapper.like(OrgUsr :: getBizOrgCode,orgUsr.getBizOrgCode())
.eq(OrgUsr::getBizOrgType,OrgEnum.人员.getKey()) .eq(OrgUsr::getBizOrgType,OrgEnum.普通人员.getKey())
.ne(OrgUsr::getOrgExpandAttr1,OrgEnum.焊工.getKey()); .ne(OrgUsr::getOrgExpandAttr1,OrgEnum.焊工.getKey());
List<OrgUsr> orgUsrList = orgUsrServiceImpl.list(wrapper); List<OrgUsr> orgUsrList = orgUsrServiceImpl.list(wrapper);
return orgUsrList; return orgUsrList;
...@@ -320,7 +320,7 @@ public class OrgServiceImpl { ...@@ -320,7 +320,7 @@ public class OrgServiceImpl {
public void delectInfo(String sequencenNbr) throws Exception { public void delectInfo(String sequencenNbr) throws Exception {
OrgUsr orgUsr = getOrgUsrById(sequencenNbr); OrgUsr orgUsr = getOrgUsrById(sequencenNbr);
LambdaQueryWrapper<DynamicFormInstance> dynamicWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DynamicFormInstance> dynamicWrapper = new LambdaQueryWrapper<>();
if(OrgEnum.人员.getKey().equals(orgUsr.getBizOrgType())){ if(OrgEnum.普通人员.getKey().equals(orgUsr.getBizOrgType())){
dynamicWrapper.eq(DynamicFormInstance::getInstanceId,sequencenNbr); dynamicWrapper.eq(DynamicFormInstance::getInstanceId,sequencenNbr);
alertFormValueServiceImpl.remove(dynamicWrapper); alertFormValueServiceImpl.remove(dynamicWrapper);
}else{ }else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment