فهرست منبع

组织修改后保存时,添加判断是否需要更新组织及下属组织人员的身份信息

luojing 5 سال پیش
والد
کامیت
10fab2a701

+ 1 - 4
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionEdit.java

@@ -212,12 +212,9 @@ class ActionEdit extends BaseAction {
 	
 	
 	private boolean checkUnitTypeName(Unit oldUnit, Unit unit) throws Exception {
 	private boolean checkUnitTypeName(Unit oldUnit, Unit unit) throws Exception {
 		List<String> oldUnitType = oldUnit.getTypeList();
 		List<String> oldUnitType = oldUnit.getTypeList();
-		String oldName = oldUnit.getName();
-		String oldSuperior = oldUnit.getSuperior();
 		List<String> unitType = unit.getTypeList();
 		List<String> unitType = unit.getTypeList();
-		String Name = unit.getName();
 		//判断两个list是否相同
 		//判断两个list是否相同
-		if (oldUnitType.retainAll(unitType) || (!oldName.equals(Name)) || (!oldSuperior.equals(unit.getSuperior()))) {
+		if (oldUnitType.retainAll(unitType) || (!StringUtils.equals(oldUnit.getName(), unit.getName())) || (!StringUtils.equals(oldUnit.getSuperior(), unit.getSuperior()))) {
 			return true;
 			return true;
 		}
 		}
 		return false;
 		return false;