|
@@ -11,10 +11,7 @@ import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.enums.NoticeTypes;
|
|
import com.goafanti.common.enums.NoticeTypes;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.*;
|
|
import com.goafanti.common.model.*;
|
|
|
-import com.goafanti.common.utils.AsyncUtils;
|
|
|
|
|
-import com.goafanti.common.utils.DateUtils;
|
|
|
|
|
-import com.goafanti.common.utils.LoggerUtils;
|
|
|
|
|
-import com.goafanti.common.utils.WeChatUtils;
|
|
|
|
|
|
|
+import com.goafanti.common.utils.*;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.JDBCIdGenerator;
|
|
import com.goafanti.core.mybatis.JDBCIdGenerator;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
@@ -126,7 +123,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
eae.setAuditorname(examineName);
|
|
eae.setAuditorname(examineName);
|
|
|
ea.setExamineName(examineName);
|
|
ea.setExamineName(examineName);
|
|
|
}else if (i==2){
|
|
}else if (i==2){
|
|
|
- if (dep.getManagerId()==null)throw new BusinessException("报销申请部门管理员不存在。");
|
|
|
|
|
|
|
+ if (dep.getManagerId()==null|| StringUtils.isBlank(dep.getManagerId())){
|
|
|
|
|
+ throw new BusinessException("报销申请部门管理员不存在。");
|
|
|
|
|
+ }
|
|
|
eae.setAuditor(dep.getManagerId());
|
|
eae.setAuditor(dep.getManagerId());
|
|
|
eae.setAuditorname(dep.getManagerName());
|
|
eae.setAuditorname(dep.getManagerName());
|
|
|
}else if (i==3){
|
|
}else if (i==3){
|