|
|
@@ -1,18 +1,13 @@
|
|
|
package com.goafanti.business.service.impl;
|
|
|
|
|
|
import com.goafanti.business.bo.InputRestrictProject;
|
|
|
+import com.goafanti.business.bo.OutRestrictProject;
|
|
|
import com.goafanti.business.bo.RestrictProjectPageList;
|
|
|
import com.goafanti.business.service.RestrictProjectService;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
-import com.goafanti.common.dao.RestrictProjectMapper;
|
|
|
-import com.goafanti.common.dao.UserBusinessMapper;
|
|
|
-import com.goafanti.common.dao.UserMapper;
|
|
|
-import com.goafanti.common.dao.UserTransferLogMapper;
|
|
|
+import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
-import com.goafanti.common.model.RestrictProject;
|
|
|
-import com.goafanti.common.model.User;
|
|
|
-import com.goafanti.common.model.UserBusiness;
|
|
|
-import com.goafanti.common.model.UserTransferLog;
|
|
|
+import com.goafanti.common.model.*;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
@@ -36,6 +31,8 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
|
|
|
private UserBusinessMapper userBusinessMapper;
|
|
|
@Resource
|
|
|
private UserMapper userMapper;
|
|
|
+ @Resource
|
|
|
+ private AdminMapper adminMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -86,7 +83,26 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
|
|
|
@Override
|
|
|
public Object list(InputRestrictProject in) {
|
|
|
in.setAid(TokenManager.getAdminId());
|
|
|
- return restrictProjectMapper.selectByUidAndAid(in);
|
|
|
+ String aname=null;
|
|
|
+ List<OutRestrictProject> list = restrictProjectMapper.selectByUidAndAid(in);
|
|
|
+ User u = userMapper.selectByPrimaryKey(in.getUid());
|
|
|
+ for (OutRestrictProject e : list) {
|
|
|
+ if (e.getType()==null){
|
|
|
+ e.setType(0);
|
|
|
+ }
|
|
|
+ if (!in.getAid().equals(AFTConstants.CAOJIN_AID)){
|
|
|
+
|
|
|
+ if (u.getAid()!=null&&u.getType()==0&&u.getAid().equals(AFTConstants.CAOJIN_AID)){
|
|
|
+ e.setType(1);
|
|
|
+ if (aname==null){
|
|
|
+ Admin admin = adminMapper.selectByPrimaryKey(AFTConstants.CAOJIN_AID);
|
|
|
+ aname =admin.getName();
|
|
|
+ }
|
|
|
+ e.setAdminName(aname);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|