diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java index 60be7ff..c05b9f4 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java @@ -31,8 +31,18 @@ public class UserServiceImpl implements IUserService { return systemClient.getUserlist(user); } - public List getUser(SelectUserVo vo){ - return new ArrayList<>(); + public List getUser(SelectUserVo vo) { + BaseResponse> userlist = systemClient.getUserlist(new SysUser()); + List list = new ArrayList<>(); + userlist.getData().forEach(user1 -> { + UserVo userVo = new UserVo(); + userVo.setUserId(user1.getUserId()); + userVo.setUserName(user1.getName()); + userVo.setUserDept(user1.getOrgName()); + userVo.setUserDeptId(user1.getOrgId()); + list.add(userVo); + }); + return list; } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/SecurityConfig.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/SecurityConfig.java new file mode 100644 index 0000000..ae28fdc --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/SecurityConfig.java @@ -0,0 +1,23 @@ +package com.chinaunicom.zyhy.ebtp.supplier.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + + @Override + protected void configure(HttpSecurity http) throws Exception { + + http + .authorizeRequests() + .anyRequest().permitAll() + .and() + .csrf().disable(); + } +} + diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java index f4c7c20..01768e9 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil; import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant; -import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskSupplierUserMapper; @@ -63,6 +62,7 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua vo.setId(id); vo.setName(baseCategoryNameVo.getName()); BaseCacheUser currentUser = TokenUtil.getCurrentUser(); + //TODO 待完善，部门名称 vo.setDeptName(currentUser.getOrganizationId()); vo.setThemName(coscoAnnualreviewTask.getAnnualreviewTheme()); vo.setReviewerName(currentUser.getUserId()); @@ -141,12 +141,13 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua IPage p = new Page<>(userVo.getBasePageRequest().getPageNo(), userVo.getBasePageRequest().getPageSize()); IPage annualreviewTaskSupplierUserVoIPage = coscoAnnualreviewTaskSupplierUserMapper.selectPage(p, userVo); + //TODO 待完善，部门名称 List deptIds = new ArrayList<>(); annualreviewTaskSupplierUserVoIPage.getRecords().forEach(vo -> { deptIds.add(vo.getDeptId()); }); - //发起单位查询 - //添加发起单位 + //TODO 发起单位查询 + //TODO 添加发起单位 return annualreviewTaskSupplierUserVoIPage; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java index a909f85..30c61aa 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java @@ -97,7 +97,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService { listVo.setCreateBy(currentUser.getUserId()); listVo.setLastUpdateTime(LocalDateTime.now()); listVo.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES); - listVo.setDeptId(currentUser.getDeptId()); + listVo.setDeptId(currentUser.getOrganizationId()); listVo.setId(PropertyUtils.getSnowflakeId()); coscoBlacklistMapper.insertCoscoBlacklist(listVo); //添加供应商 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java index 2b5fc91..5b475f8 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java @@ -81,7 +81,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl deptIds = new ArrayList<>(); BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - BaseResponse orgInfo = systemClient.getOrgInfo(currentUser.getDeptId()); + BaseResponse orgInfo = systemClient.getOrgInfo(currentUser.getOrganizationId()); if (orgInfo.isSuccess()) { SysOrg data = orgInfo.getData(); String orgFullId = data.getOrgFullId(); String[] split = orgFullId.split(","); List split1 = new ArrayList<>(); for (String s : split) { - if(!currentUser.getDeptId().equals(s)){ + if(!currentUser.getOrganizationId().equals(s)){ split1.add(s); } } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/ScheduledTasksController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/ScheduledTasksController.java index 188316b..1c2b8a5 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/ScheduledTasksController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/ScheduledTasksController.java @@ -14,7 +14,7 @@ public class ScheduledTasksController { @RequestMapping() public void checkTask() { - scheduledTasksService.closeTask(); + scheduledTasksService.checkTask(); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ScheduledTasksService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ScheduledTasksService.java index 4bf7016..ac93b02 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ScheduledTasksService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ScheduledTasksService.java @@ -1,6 +1,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service; -public interface ScheduledTasksService { +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.NoTaskVo; +import java.util.List; + +public interface ScheduledTasksService { + List checkTask(); void closeTask(); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java index 9098845..1f87471 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java @@ -100,7 +100,7 @@ public class CoscoEvaluateTaskAssignDeptServiceImpl implements ICoscoEvaluateTas CoscoEvaluateTaskAssignDept dept = new CoscoEvaluateTaskAssignDept(); dept.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId()); BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - dept.setParentDeptId(currentUser.getDeptId()); + dept.setParentDeptId(currentUser.getOrganizationId()); //获取是否已经拥有权限，如果拥有权限不添加 List coscoEvaluateTaskAssignDepts = coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptList(dept); //如果没有权限添加 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java index a9b1b9b..cba4cff 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java @@ -261,7 +261,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { List taskIds = coscoEvaluateTaskListVoIPage.getRecords().stream().map(CoscoEvaluateTaskListVo::getId).collect(Collectors.toList()); //获取本部门id BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - taskListVo.setDeptId(currentUser.getDeptId()); + taskListVo.setDeptId(currentUser.getOrganizationId()); taskListVo.setTaskIds(taskIds); //获取上级部门id taskListVo.setParentDeptId(SupplierUserConstant.PARENT_DEPT_ID); @@ -271,7 +271,9 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { Map map = vos.stream().collect(Collectors.toMap(DivisionVo::getTaskId, DivisionVo::getDivision)); //根据分工参数赋值 coscoEvaluateTaskListVoIPage.getRecords().forEach(task -> { - task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0"); //1表示可修改 0不可修改 + if(task.getDeptId()!=null){ + task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0"); //1表示可修改 0不可修改 + } task.setDivision(map.get(task.getId()) == null ? "2" : map.get(task.getId())); //2表示未分工 1表示已分工 }); return coscoEvaluateTaskListVoIPage; @@ -346,7 +348,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { @Override public int incrementalDivisionOfLaborAdditionAdd(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - addCoscoEvaluateTaskVo.setDeptId(currentUser.getDeptId()); + addCoscoEvaluateTaskVo.setDeptId(currentUser.getOrganizationId()); deleteAll(addCoscoEvaluateTaskVo); addEvalTaskInfo(addCoscoEvaluateTaskVo); return 1; @@ -497,7 +499,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { addCoscoEvaluateTaskVo.setId(PropertyUtils.getSnowflakeId()); addCoscoEvaluateTaskVo.setCreateBy(currentUser.getUserId()); addCoscoEvaluateTaskVo.setUpdateBy(currentUser.getUserId()); - addCoscoEvaluateTaskVo.setDeptId(currentUser.getDeptId()); + addCoscoEvaluateTaskVo.setDeptId(currentUser.getOrganizationId()); coscoEvaluateTaskMapper.insertCoscoEvaluateTask(addCoscoEvaluateTaskVo); }