|
|
@@ -250,7 +250,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
* 根据传入参数处理各种情况,并且处理传入数据
|
|
|
* @param in 输入部门参数
|
|
|
* @param useDep 原部门参数
|
|
|
- * @param dep 修改部门擦拭
|
|
|
+ * @param dep 修改部门参数
|
|
|
*/
|
|
|
private void pushUpdateDep(InputDep in, Department useDep, Department dep) {
|
|
|
List<String> orderS = new ArrayList();
|
|
|
@@ -258,7 +258,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
|
|
|
if(StringUtils.isBlank(useDep.getFinanceId())&&StringUtils.isNotBlank(in.getFinanceId())){
|
|
|
addExamine(useDep, in.getFinanceId(),orderS);
|
|
|
}
|
|
|
- if(in.getManagerId()!=null&&useDep.getManagerId()!=null&&in.getManagerId().equals(useDep.getManagerId())){
|
|
|
+ if(in.getManagerId()!=null&&useDep.getManagerId()!=null&&!in.getManagerId().equals(useDep.getManagerId())){
|
|
|
expenseAccountExamineMapper.updateExamine(in.getManagerId(),useDep.getManagerId());
|
|
|
}
|
|
|
|