成本监审表模板管理

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyFdTemplateController.java

@@ -19,6 +19,7 @@ import com.hotent.surveyinfo.req.ConstSurveyFdPageParam;
 import com.hotent.surveyinfo.req.ConstSurveyFdPageReq;
 import com.hotent.surveyinfo.req.ConstSurveyPageReq;
 import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.manager.UserManager;
 import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import io.swagger.annotations.Api;
@@ -63,6 +64,9 @@ public class CostSurveyFdTemplateController extends BaseController<CostSurveyFdT
 	CostSurveyFdTemplateHeadersDao costSurveyTemplateHeadersDao;
 	@Autowired
 	CostSurveyFdTemplateItemsDao costSurveyTemplateItemsDao;
+
+	@Autowired
+	private UserManager userService;
 	// 创建通用服务实例
 	private final CrudService crudService = new CrudService();
 	/**
@@ -131,6 +135,7 @@ public class CostSurveyFdTemplateController extends BaseController<CostSurveyFdT
 			costSurveyTemplate.setUpdateTime(LocalDateTime.now());
 		}
 		User currentUser = ContextUtil.getCurrentUser();
+		currentUser = userService.get(currentUser.getUserId());
 		Integer dataScope = currentUser.getDataScope();
 		if (dataScope == 0) {
 			costSurveyTemplate.setAreaLevel("0");

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyTemplateController.java

@@ -16,6 +16,8 @@ import com.hotent.surveyinfo.model.*;
 import com.hotent.surveyinfo.req.ConstSurveyPageParam;
 import com.hotent.surveyinfo.req.ConstSurveyPageReq;
 import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.api.service.IUserService;
+import com.hotent.uc.manager.UserManager;
 import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import io.swagger.annotations.Api;
@@ -72,6 +74,9 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
 
     @Autowired
     private CostVerifyTemplateItemsManager costVerifyTemplateItemsManager;
+
+    @Autowired
+    private UserManager userService;
     // 创建通用服务实例
     private final CrudService crudService = new CrudService();
 
@@ -127,6 +132,7 @@ public class CostSurveyTemplateController extends BaseController<CostSurveyTempl
     public CommonResult<String> save(@ApiParam(name = "CostSurveyTemplate", value = "成本调查表模板表对象", required = true) @RequestBody CostSurveyTemplate costSurveyTemplate) throws Exception {
         String msg = StringUtil.isEmpty(costSurveyTemplate.getSurveyTemplateId()) ? "添加成本调查表模板表成功" : "更新成本调查表模板表成功";
         User currentUser = ContextUtil.getCurrentUser();
+        currentUser = userService.get(currentUser.getUserId());
         Integer dataScope = currentUser.getDataScope();
         if (dataScope == 0) {
             costSurveyTemplate.setAreaLevel("0");

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostVerifyTemplateController.java

@@ -19,6 +19,7 @@ import com.hotent.surveyinfo.req.ConstSurveyPageReq;
 import com.hotent.surveyinfo.req.ConstVerifyPageParam;
 import com.hotent.surveyinfo.req.ConstVerifyPageReq;
 import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.manager.UserManager;
 import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import io.swagger.annotations.Api;
@@ -63,6 +64,9 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 	@Autowired
 	CostSurveyTemplateVersionManager costSurveyTemplateVersionMapper;
 
+	@Autowired
+	private UserManager userService;
+
 
 	// 创建通用服务实例
 	private final CrudService crudService = new CrudService();
@@ -207,6 +211,7 @@ public class CostVerifyTemplateController extends BaseController<CostVerifyTempl
 			costSurveyTemplate.setUpdateTime(LocalDateTime.now());
 		}
 		User currentUser = ContextUtil.getCurrentUser();
+		currentUser = userService.get(currentUser.getUserId());
 		Integer dataScope = currentUser.getDataScope();
 		if (dataScope == 0) {
 			costSurveyTemplate.setAreaLevel("0");

assistMg/src/main/java/com/hotent/surveyinfo/manager/impl/CostSurveyFdTemplateManagerImpl.java

@@ -163,7 +163,11 @@ public class CostSurveyFdTemplateManagerImpl extends BaseManagerImpl<CostSurveyF
 	public PageList<CostSurveyFdTemplate> listPage(ConstSurveyFdPageParam param) throws Exception {
 		IUser iUser = ContextUtil.getCurrentUser();
 		User user = userService.getByAccount(iUser.getAccount());
-		param.setDataScope(user.getDataScope());
+		if(iUser.isAdmin()){
+			param.setDataScope(null);
+		}else{
+			param.setDataScope(user.getDataScope());
+		}
 		param.setProvinceCode(user.getProvinceCode());
 		param.setCityCode(user.getCityCode());
 		param.setCountyCode(user.getCountyCode());

assistMg/src/main/java/com/hotent/surveyinfo/manager/impl/CostSurveyTemplateManagerImpl.java

@@ -173,7 +173,11 @@ public class CostSurveyTemplateManagerImpl extends BaseManagerImpl<CostSurveyTem
 	public PageList<CostSurveyTemplate> getCostSurveyListPage( ConstSurveyPageParam params) throws Exception {
 		IUser iUser = ContextUtil.getCurrentUser();
 		User user = userService.getByAccount(iUser.getAccount());
-		params.setDataScope(user.getDataScope());
+		if(iUser.isAdmin()){
+			params.setDataScope(null);
+		}else{
+			params.setDataScope(user.getDataScope());
+		}
 		params.setProvinceCode(user.getProvinceCode());
 		params.setCityCode(user.getCityCode());
 		params.setCountyCode(user.getCountyCode());

assistMg/src/main/java/com/hotent/surveyinfo/manager/impl/CostVerifyTemplateManagerImpl.java

@@ -163,7 +163,11 @@ public class CostVerifyTemplateManagerImpl extends BaseManagerImpl<CostVerifyTem
 	public PageList<CostVerifyTemplate> listPage(ConstVerifyPageParam param) throws Exception {
 		IUser iUser = ContextUtil.getCurrentUser();
 		User user = userService.getByAccount(iUser.getAccount());
-		param.setDataScope(user.getDataScope());
+		if(iUser.isAdmin()){
+			param.setDataScope(null);
+		}else{
+			param.setDataScope(user.getDataScope());
+		}
 		param.setProvinceCode(user.getProvinceCode());
 		param.setCityCode(user.getCityCode());
 		param.setCountyCode(user.getCountyCode());

assistMg/src/main/resources/mapper/CostSurveyFdTemplateMapper.xml

@@ -97,8 +97,7 @@
 
 
 
-	<select id="getCostSurveyFdTemplatePage"
-			resultMap="BaseResultMap">
+	<select id="getCostSurveyFdTemplatePage" resultMap="BaseResultMap">
 		SELECT
 		c.*
 		FROM
@@ -117,7 +116,7 @@
 			<if test=" status != null and  status != ''">
 				and c.status=#{ status}
 			</if>
-			<if test=" dataScope != null and  dataScope != ''">
+			<if test=" dataScope != null and dataScope >= 0">
 				<if test=" dataScope ==0">
 					and c.area_code= #{provinceCode}
 				</if>

assistMg/src/main/resources/mapper/CostSurveyTemplateMapper.xml

@@ -112,7 +112,7 @@
 			<if test=" status != null and  status != ''">
 				and c.status=#{ status}
 			</if>
-			<if test=" dataScope != null and  dataScope != ''">
+			<if test="dataScope != null and dataScope >= 0">
 				<if test=" dataScope ==0">
 					and c.area_code= #{provinceCode}
 				</if>

assistMg/src/main/resources/mapper/CostVerifyTemplateMapper.xml

@@ -114,7 +114,7 @@
 			<if test=" status != null and  status != ''">
 				and c.status=#{ status}
 			</if>
-			<if test=" dataScope != null and  dataScope != ''">
+			<if test=" dataScope != null and dataScope >= 0">
 				<if test=" dataScope ==0">
 					and c.area_code= #{provinceCode}
 				</if>

uc/src/main/java/com/hotent/uc/manager/impl/UserManagerImpl.java

@@ -1067,7 +1067,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
         	}
 
 		}
-		
+
 		String oldPswdEncrypt = passwordEncoder.encode(oldPwd);
 		if(user.getPassword().equals(oldPswdEncrypt)){
 			user.setPassword(passwordEncoder.encode(newPwd));
@@ -2577,7 +2577,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 		this.copyQuerysInParams(queryFilter);
     	handleQueryFilter(queryFilter);
     	PageBean pageBean = queryFilter.getPageBean();
-    	if(BeanUtils.isEmpty(pageBean)){	
+    	if(BeanUtils.isEmpty(pageBean)){
     		pageBean = new PageBean(1, PageBean.WITHOUT_PAGE, false);
     	}
     	IPage<User> query = baseMapper.queryByType(convert2IPage(pageBean),convert2Wrapper(queryFilter, currentModelClass()));
@@ -2794,14 +2794,14 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 		}).collect(Collectors.toList());
 		return groupList;
 	}
-	
+
 	/**
 	 * 删除用户组缓存
 	 * @param userId
 	 */
 	@CacheEvict(value = CacheKeyConst.EIP_UC_USER_GROUPS, key = "#userId", ignoreException = false)
 	public void removeUserGroupsCache(String userId) {
-		
+
 	}
 
 	/**
@@ -3179,7 +3179,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 			return new CommonResult<UserVo>(true, "获取用户失败，"+e.getMessage()+"", null);
 		}
 	}
-	
+
 	@Override
 	public User getUserByMpOpenId(String wxWorkId) {
 		return baseMapper.getUserByMpOpenId(wxWorkId);
@@ -3517,7 +3517,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 				}
 			}
 		}
-		
+
 		IPage<Map<String, Object>> page = null;
 		//如果没有传入组织条件，则获取用户默认维度下的主组织。
 		if (!hasOrgCondition) {
@@ -3530,7 +3530,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 			//传入了pathName,则查询当前组织及其子组织下的用户
 			page = baseMapper.queryUserWithMainOrgPostByOrgPath(convert2IPage(queryFilter.getPageBean()),convert2Wrapper(queryFilter,currentModelClass()));
 		}
-		
+
 		if (BeanUtils.isNotEmpty(page) && BeanUtils.isNotEmpty(page.getRecords())) {
 			for (Map<String, Object> records : page.getRecords()) {
 				if (BeanUtils.isNotEmpty(records.get("pathname"))) {
@@ -3543,7 +3543,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 				}
 			}
 		}
-		
+
 		return new PageList<>(page);
 	}
 	@Override
@@ -4007,7 +4007,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 		if (user.getDataScope().equals(2)) {
 			wrapper.eq("COUNTY_CODE",user.getCountyCode());
 		}
-
+		wrapper.ne("ACCOUNT_","admin");
 		return this.list(wrapper);
 	}
 
@@ -4019,16 +4019,16 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 		}
 		return true;
 	}
-	
+
 	@Override
 	public void batchUpdateUsersFromExterUni(String type, List<WxUser> userList) {
 		if(BeanUtils.isNotEmpty(userList)){
 			//1、只处理有手机号的用户
 			List<WxUser> userListHasMobile = userList.stream().filter(e->BeanUtils.isNotEmpty(e.getMobile())).collect(Collectors.toList());
-			
+
 			//2、获取系统存在相同手机号的用户
 			List<User> existUserList = this.getAll();
-			
+
 			//3、整理出系统未存在的用户，和已存在的用户
 			List<WxUser> willCreate = new ArrayList<>();
 			List<UserUnite> userUniteList = new ArrayList<>();
@@ -4038,14 +4038,14 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 				if(exist.isPresent()){
 					UserUnite userUnite = new UserUnite();
 					userUnite.setUserId(exist.get().getUserId());
-					
+
 					if("weChatWork".equals(type)){
 						userUnite.setWxWorkId(wxUser.getUserid());
 					}else if("dingtalk".equals(type)){
 						userUnite.setDingtalkId(wxUser.getUserid());
 					}
 					userUniteList.add(userUnite);
-					
+
 					//组织
 					if(BeanUtils.isNotEmpty(wxUser.getDepartment())){
 						for(String deptid : wxUser.getDepartment()){
@@ -4059,7 +4059,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 					willCreate.add(wxUser);
 				}
 			}
-			
+
 			//4、创建用户
 			String initPwd = pwdStrategyManager.getDefault().getInitPwd();
 			//将用户加入一般用户角色中
@@ -4072,18 +4072,18 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 				wxUser.setPassword(initPwd);
 				wxUser.setRoleId(roleId);
 				User newUser = this.createUserFromWxUser(wxUser);
-				
+
 				UserUnite userUnite = new UserUnite();
 				userUnite.setUserId(newUser.getUserId());
-				
+
 				if("weChatWork".equals(type)){
 					userUnite.setWxWorkId(wxUser.getUserid());
 				}else if("dingtalk".equals(type)){
 					userUnite.setDingtalkId(wxUser.getUserid());
 				}
-				
+
 				userUniteList.add(userUnite);
-				
+
 				if(BeanUtils.isNotEmpty(wxUser.getDepartment())){
 					for(String deptid : wxUser.getDepartment()){
 						OrgUser ou = new OrgUser();
@@ -4095,7 +4095,7 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 			}
 			//6批量处理用户与组织的关系
 			this.orgUserManager.batchUpdateOrgUser(orgUserList);
-			
+
 			//6、批量处理绑定关系
 			this.userUniteManager.updateUserUniteList(userUniteList);
 		}
@@ -4106,24 +4106,24 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 		newUser.setFullname(wxUser.getName());
 		newUser.setAccount(wxUser.getMobile());
 		newUser.setMobile(wxUser.getMobile());
-		
+
 		newUser.setId(UniqueIdUtil.getSuid());
 		newUser.setStatus(User.STATUS_NORMAL);
 		newUser.setCreateTime(LocalDateTime.now());
 		newUser.setFrom(User.FROM_RESTFUL);
-		
+
 		newUser.setPassword(passwordEncoder.encode(wxUser.getPassword()));
 		newUser.setPwdCreateTime(LocalDateTime.now());
-		
+
 		try {
 			this.create(newUser);
-			
+
 			UserRole userRole = new UserRole();
 			userRole.setId(UniqueIdUtil.getSuid());
 			userRole.setRoleId(wxUser.getRoleId());
 			userRole.setUserId(newUser.getId());
 			userRoleManager.save(userRole);
-			
+
 		} catch (Exception e) {
 			throw new RuntimeException(e.getMessage());
 		}