From 43955bff8a6d212ac154745545de8e5ec5ea5f88 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 6 Nov 2020 16:04:51 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/service/app/impl/ResultRecordServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 2e6a569b..2cf31982 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -1131,8 +1131,9 @@ public class ResultRecordServiceImpl extends ServiceImpl auth = new HashMap<>(); - auth.put("showScore",1); auth.put("showResult",1); + auth.put("showScore",1); + List currentResultRecords = flowRecordService.selectFlowRecordByRecordIdStatus(recordDetailDto.getResultRecordId(),2); log.info("当前用户登陆用户 id :" + recordDetailDto.getLoginUserId()); if(currentResultRecords !=null && currentResultRecords.size() > 0 ){ @@ -1145,6 +1146,14 @@ public class ResultRecordServiceImpl extends ServiceImpl map = JSONObject.parseObject(currentResultRecord.getFlowStaffIdRole(),Map.class); List roleIds = null; From 069de498f7981fe5ca60438279b0bebd907c9c15 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 6 Nov 2020 16:07:23 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/impl/ResultRecordServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 2cf31982..8395d1c7 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -1137,6 +1137,15 @@ public class ResultRecordServiceImpl extends ServiceImpl currentResultRecords = flowRecordService.selectFlowRecordByRecordIdStatus(recordDetailDto.getResultRecordId(),2); log.info("当前用户登陆用户 id :" + recordDetailDto.getLoginUserId()); if(currentResultRecords !=null && currentResultRecords.size() > 0 ){ + FlowRecord currentFlowRecord = currentResultRecords.get(0); + int flowProcess = currentFlowRecord.getFlowProcess(); + if(flowProcess < 3 ){ + auth.put("showResult",0); + } + if( flowProcess < 4 ){ + auth.put("showScore",0); + } + FlowRecord currentResultRecord = null; for(FlowRecord flowRecord:currentResultRecords){ if(flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId())){ @@ -1146,14 +1155,6 @@ public class ResultRecordServiceImpl extends ServiceImpl map = JSONObject.parseObject(currentResultRecord.getFlowStaffIdRole(),Map.class); List roleIds = null; From c9ec84d3144bde482450d6b9bd140b18deb7748a Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 6 Nov 2020 16:17:32 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/app/resp/FlowDetailResp.java | 1 + .../sys/service/app/impl/ResultRecordServiceImpl.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java b/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java index 14c1225a..bdfbe2aa 100644 --- a/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java +++ b/src/main/java/com/lz/modules/app/resp/FlowDetailResp.java @@ -9,5 +9,6 @@ public class FlowDetailResp { private Long flowRecordId; private String departName; private String avatar; + private int status ; } diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 8395d1c7..99c429ea 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -1182,6 +1182,14 @@ public class ResultRecordServiceImpl extends ServiceImpl Date: Fri, 6 Nov 2020 16:42:25 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=80=83=E8=AF=84?= =?UTF-8?q?=E7=BB=84=E9=87=8D=E5=90=8D=E6=90=9C=E7=B4=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/config/ShiroConfig.java | 2 +- src/main/resources/mapper/flow/EvaluationGroupMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 1fe3d0c6..70d6ba95 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -71,7 +71,7 @@ public class ShiroConfig { filterMap.put("/dtlg/jump", "anon"); filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/updateLuck", "anon"); - filterMap.put("/**", "oauth2"); + filterMap.put("/**", "anon"); shiroFilter.setFilterChainDefinitionMap(filterMap); return shiroFilter; diff --git a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml index 80e44514..411704b7 100644 --- a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml +++ b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml @@ -136,7 +136,7 @@ From cfd82dfc1a9a3c40a8281827a905ffc08d7ae844 Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 6 Nov 2020 16:52:44 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/config/ShiroConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 70d6ba95..1fe3d0c6 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -71,7 +71,7 @@ public class ShiroConfig { filterMap.put("/dtlg/jump", "anon"); filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/updateLuck", "anon"); - filterMap.put("/**", "anon"); + filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); return shiroFilter; From 10e027c2a06a796ebe66cef8292d7dc339f6a244 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 6 Nov 2020 17:05:28 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/modules/app/controller/StaffRoleController.java | 2 +- .../modules/sys/service/app/impl/ResultRecordServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java index b1157696..a368def7 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -210,7 +210,7 @@ public class StaffRoleController { return staffRoleService.selectRoleInfoBy(roleModel); } - // http://localhost:8080/lz_management/user/lzstaffrole/role/detail?id=4 + // http://localhost:8080/lz_management/user/lzstaffrole/role/detail?id=28 // http://localhost:8080/lz_management/user/lzstaffrole/role/detail @RequestMapping("/role/detail") public R roleDetail(RoleModel roleModel) { diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index 99c429ea..653b2858 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -1187,7 +1187,7 @@ public class ResultRecordServiceImpl extends ServiceImpl Date: Mon, 9 Nov 2020 09:46:26 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java | 2 ++ .../lz/modules/flow/service/impl/StaffRoleServiceImpl.java | 4 ++++ src/main/resources/mapper/flow/StaffRoleMapper.xml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java b/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java index a79f3bb1..ca6b7343 100644 --- a/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java @@ -50,4 +50,6 @@ public interface StaffRoleMapper extends BaseMapper { List selectByRoleLevel(@Param("name") String name); List selectPageByRoleLevel(@Param("page") IPage page, @Param("name") String name); + + StaffRole selectStaffRolesByStaffIdDepartmentLevel(@Param("staffId") Long staffId, @Param("departmentLevel") String departmentLevel); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index 4723ae33..af0d0c22 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -407,6 +407,10 @@ public class StaffRoleServiceImpl extends ServiceImpl select * from lz_staff_role where is_delete = 0 and department_level = #{name} + From 2c17a09954e2c93145998c04aba0038843cdc3a4 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Mon, 9 Nov 2020 09:47:28 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/flow/StaffRoleMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/mapper/flow/StaffRoleMapper.xml b/src/main/resources/mapper/flow/StaffRoleMapper.xml index a15e69b0..1b9b9d66 100644 --- a/src/main/resources/mapper/flow/StaffRoleMapper.xml +++ b/src/main/resources/mapper/flow/StaffRoleMapper.xml @@ -153,6 +153,8 @@ + + From 66d13ad1545ea87952862da5ba559b4f1908d5ef Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 9 Nov 2020 15:22:27 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=85=AC=E5=BC=8F=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 008916e0..8273505c 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -408,7 +408,6 @@ public class ResultRecordController extends AbstractController { BigDecimal weight = BigDecimal.ZERO; for (ResultModel model:resultModels ) { - setCalculateValue(calculateModels, model); ResultRecortModelDto resultRecortModelDto = new ResultRecortModelDto(); BeanUtils.copyProperties(model, resultRecortModelDto); if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的 @@ -421,6 +420,7 @@ public class ResultRecordController extends AbstractController { resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType()); for (ResultDetailDto dto:detailDtos ) { + //下面设置计算公式 dto.setCalculate(setCalculateValue(calculateModels, dto)) ; weight = weight.add(dto.getCheckWeight()); //获取评分详细 @@ -460,7 +460,7 @@ public class ResultRecordController extends AbstractController { dto.setScoreDtos(scoreDtos); } } - //下面设置计算公式 + resultRecortModelDto.setDetailDtos(detailDtos); resultRecortModelDtos.add(resultRecortModelDto); @@ -476,8 +476,10 @@ public class ResultRecordController extends AbstractController { private String setCalculateValue(List calculateModels, Object model){ String mName = model.getClass().getName();//.replace("req", "dto"); String cal = ""; - for (CalculateModel calculate:calculateModels - ) { + //for (CalculateModel calculate:calculateModels + //) { + for(int i = 0; i < calculateModels.size(); i++){ + CalculateModel calculate = calculateModels.get(i); if(mName.contains("." + calculate.getTaboleBeanName())){//支持表名生成的req和dto //获取值 try { @@ -487,8 +489,9 @@ public class ResultRecordController extends AbstractController { if(obj != null){ calculate.setFieldValue(obj.toString()); } - if(calculate.getFieldValue() == null){ - cal += calculate.getFieldBeanName(); + //最后一个对象为自己，或者获取的对象中的属性为null + if(calculate.getFieldValue() == null || i == calculateModels.size()){ + cal += ("{" + calculate.getFieldBeanName() + "}"); }else{ cal += calculate.getFieldValue(); } From c68e866d8f8f3d28b10d400e238266abb65dfe90 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 9 Nov 2020 15:32:58 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 8273505c..7ee27ecd 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -490,7 +490,7 @@ public class ResultRecordController extends AbstractController { calculate.setFieldValue(obj.toString()); } //最后一个对象为自己，或者获取的对象中的属性为null - if(calculate.getFieldValue() == null || i == calculateModels.size()){ + if(calculate.getFieldValue() == null || i == calculateModels.size() - 1){ cal += ("{" + calculate.getFieldBeanName() + "}"); }else{ cal += calculate.getFieldValue(); From 55ced3dc09cc52346bfcd8ac24bc071c175aa368 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 9 Nov 2020 15:45:17 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 7ee27ecd..d0c8afe8 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -491,7 +491,7 @@ public class ResultRecordController extends AbstractController { } //最后一个对象为自己，或者获取的对象中的属性为null if(calculate.getFieldValue() == null || i == calculateModels.size() - 1){ - cal += ("{" + calculate.getFieldBeanName() + "}"); + cal += ("{" + calculate.getFieldBeanName().substring(0, 1).toLowerCase() + calculate.getFieldBeanName().substring(1) + "}"); }else{ cal += calculate.getFieldValue(); } From 929753989b567cac4282a23bb92d61571f3ca087 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Mon, 9 Nov 2020 16:41:55 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lz/common/utils/StringUtil.java | 13 +++++ .../app/controller/TestController.java | 7 +++ .../lz/modules/flow/dao/RecordAuthMapper.java | 2 + .../lz/modules/flow/dao/StaffRoleMapper.java | 6 +++ .../com/lz/modules/flow/entity/StaffMenu.java | 6 +-- .../flow/service/RecordAuthService.java | 2 + .../flow/service/StaffRoleService.java | 4 ++ .../service/impl/RecordAuthServiceImpl.java | 14 ++++- .../service/impl/StaffRoleServiceImpl.java | 53 ++++++++++++++++--- .../sys/controller/SysLoginController.java | 21 +++++--- .../mapper/flow/RecordAuthMapper.xml | 9 ++++ .../resources/mapper/flow/StaffRoleMapper.xml | 11 ++++ 12 files changed, 131 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/lz/common/utils/StringUtil.java b/src/main/java/com/lz/common/utils/StringUtil.java index d075f2f9..584e63c4 100644 --- a/src/main/java/com/lz/common/utils/StringUtil.java +++ b/src/main/java/com/lz/common/utils/StringUtil.java @@ -144,6 +144,19 @@ public class StringUtil extends StringUtils { return result; } + + public static List splitToLongList(String source, String sep) { + List result = new ArrayList(); + if (isBlank(source)) { + return result; + } + String[] tempResult = source.split(sep); + for (String item : tempResult) { + result.add(NumberUtil.objToLongDefault(item,0)); + } + return result; + } + /** * @param source 待处理字符串 * @return diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index b1255e5d..f42bbb69 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -267,6 +267,13 @@ public class TestController { R r = resultRecordService.initFlowRecord(resultRecordId); } + // http://localhost:8080/lz_management/test/getAuth?userId=314 + @RequestMapping("/test/getAuth") + public R getAuth(Long userId) throws Exception{ + Map map = staffRoleService.getRoleByUserId(userId); + return R.ok().put("data",map); + } + public static void main(String[] args) { String a = "{\"313\":[17,20,13]}"; diff --git a/src/main/java/com/lz/modules/flow/dao/RecordAuthMapper.java b/src/main/java/com/lz/modules/flow/dao/RecordAuthMapper.java index b5c92f89..24e4591d 100644 --- a/src/main/java/com/lz/modules/flow/dao/RecordAuthMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/RecordAuthMapper.java @@ -40,4 +40,6 @@ public interface RecordAuthMapper extends BaseMapper { List selectAll(); List selectAuthByRoleIds(@Param("roleIds") List roleIds); + + List selectAuthByIds(@Param("authIds") List authIds); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java b/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java index ca6b7343..02b38dea 100644 --- a/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/StaffRoleMapper.java @@ -9,6 +9,8 @@ package com.lz.modules.flow.dao; */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.lz.modules.flow.entity.AuthDto; +import com.lz.modules.flow.entity.StaffMenu; import com.lz.modules.flow.entity.StaffRole; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -52,4 +54,8 @@ public interface StaffRoleMapper extends BaseMapper { List selectPageByRoleLevel(@Param("page") IPage page, @Param("name") String name); StaffRole selectStaffRolesByStaffIdDepartmentLevel(@Param("staffId") Long staffId, @Param("departmentLevel") String departmentLevel); + + List selectAllByStaffId(@Param("staffId") Long staffId); + + List selectAllMenus(@Param("userId") Long userId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/entity/StaffMenu.java b/src/main/java/com/lz/modules/flow/entity/StaffMenu.java index dbb43b83..d0175c2e 100644 --- a/src/main/java/com/lz/modules/flow/entity/StaffMenu.java +++ b/src/main/java/com/lz/modules/flow/entity/StaffMenu.java @@ -42,7 +42,7 @@ public class StaffMenu implements java.io.Serializable { private Long parentId; //授权 id @ApiModelProperty(value = "授权 id", name = "authIds") - private Long authIds; + private String authIds; @TableField(exist=false) private List childs; /** @@ -139,14 +139,14 @@ public class StaffMenu implements java.io.Serializable { * 授权 id * @return */ - public Long getAuthIds() { + public String getAuthIds() { return authIds; } /** * 授权 id * @param authIds */ - public void setAuthIds(Long authIds) { + public void setAuthIds(String authIds) { this.authIds = authIds; } diff --git a/src/main/java/com/lz/modules/flow/service/RecordAuthService.java b/src/main/java/com/lz/modules/flow/service/RecordAuthService.java index 8e2b32e7..774b5b28 100644 --- a/src/main/java/com/lz/modules/flow/service/RecordAuthService.java +++ b/src/main/java/com/lz/modules/flow/service/RecordAuthService.java @@ -47,4 +47,6 @@ public interface RecordAuthService extends IService { Long getRoleIdByStaffRoleInfo(String flowStaffIdRole,Long approvalStaffId); Map selectAuthByRoleIds(List roleIds); + + Map selectAuthByIds(List authIds); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/StaffRoleService.java b/src/main/java/com/lz/modules/flow/service/StaffRoleService.java index 04b44e22..1f7f8467 100644 --- a/src/main/java/com/lz/modules/flow/service/StaffRoleService.java +++ b/src/main/java/com/lz/modules/flow/service/StaffRoleService.java @@ -61,4 +61,8 @@ public interface StaffRoleService extends IService { R roleAddOrUpdate(RoleModel roleModel); R delete(RoleModel roleModel); + + List selectAllByStaffId(Long userId); + + Map getRoleByUserId(Long userId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java index 0b3182f7..55cd25a8 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/RecordAuthServiceImpl.java @@ -129,8 +129,20 @@ public class RecordAuthServiceImpl extends ServiceImpl selectAuthByIds(List authIds) { + Map map = new HashMap<>(); + List list = recordAuthMapper.selectAuthByIds(authIds); + if(CollectionUtils.isNotEmpty(list)){ + for(AuthDto authDto:list){ + map.put(authDto.getIdentity(),authDto.getStatus()); + } + } + return map; + } - public Auth getAuth(List auths) { + + public Auth getAuth(List auths) { Map map = new HashMap<>(); if (CollectionUtils.isNotEmpty(auths)) { for(RecordAuth recordAuth : auths){ diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index af0d0c22..b3a8c21e 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -32,6 +32,7 @@ import com.lz.modules.sys.entity.SysMenuEntity; import com.lz.modules.sys.entity.SysRoleEntity; import com.lz.modules.sys.service.app.ResultRecordService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -90,13 +91,16 @@ public class StaffRoleServiceImpl extends ServiceImpl deparmentNames = new ArrayList<>(); if (staffRole.getDepartmentId().equals(new Long(2))) { List staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId()); - for(StaffRoleDepartment staffRoleDepartment:staffRoleDepartments){ + for (StaffRoleDepartment staffRoleDepartment : staffRoleDepartments) { DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(staffRoleDepartment.getDepartmentId()); deparmentNames.add(departmentsEntity.getDepartmentName()); } @@ -360,8 +364,8 @@ public class StaffRoleServiceImpl extends ServiceImpl selectAllByStaffId(Long staffId) { + + return staffRoleMapper.selectAllByStaffId(staffId); + } + + @Override + public Map getRoleByUserId(Long userId) { + Map map = new HashMap<>(); + List staffRoleList = staffRoleMapper.selectAllByStaffId(userId); + List staffMenus = new ArrayList<>(); + DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(userId); + if(new Integer(1).equals(departmentsStaffRelateEntity.getIsLeader())){ + List staffMenuDepartmentList= staffMenuService.selectByParentId( RoleMenuEnums.DEPARTMENT_PM.getType()); + if(CollectionUtils.isNotEmpty(staffMenuDepartmentList)){ + staffMenus.addAll(staffMenuDepartmentList); + } + } + if(CollectionUtils.isNotEmpty(staffRoleList)){ + List staffMenuList = staffRoleMapper.selectAllMenus(userId); + if(CollectionUtils.isNotEmpty(staffMenuList)){ + staffMenus.addAll(staffMenuList); + } + } + if(CollectionUtils.isNotEmpty(staffMenus) && staffMenus.size() > 0 ){ + List authIds = new ArrayList<>(); + for(StaffMenu staffMenu:staffMenus){ + List ids = StringUtil.splitToLongList(staffMenu.getAuthIds(),","); + authIds.addAll(ids); + } + if(authIds.size() > 0){ + map = recordAuthService.selectAuthByIds(authIds); + } + } + return map; + } + public void insertPM(StaffRole staffRole, Long parentId, StaffEntity staffEntity) { staffRole.setEvaluationGroupId(EvaluationGroupEnums.ALL.getType());//全部考评组 staffRole.setDepartmentId(DepartmentPMEnums.ALL.getType());//所有部门 diff --git a/src/main/java/com/lz/modules/sys/controller/SysLoginController.java b/src/main/java/com/lz/modules/sys/controller/SysLoginController.java index d8f9b154..bffa9653 100644 --- a/src/main/java/com/lz/modules/sys/controller/SysLoginController.java +++ b/src/main/java/com/lz/modules/sys/controller/SysLoginController.java @@ -18,6 +18,8 @@ import com.lz.modules.app.enums.SmsTypeEnum; import com.lz.modules.app.service.CodeRecordService; import com.lz.modules.app.service.SmsTemplateService; import com.lz.modules.app.service.StaffService; +import com.lz.modules.flow.entity.StaffRole; +import com.lz.modules.flow.service.StaffRoleService; import com.lz.modules.sys.entity.SysConfigEntity; import com.lz.modules.sys.entity.SysUserEntity; import com.lz.modules.sys.form.SysLoginForm; @@ -41,9 +43,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.IOException; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.*; /** * 登录相关 @@ -64,6 +64,9 @@ public class SysLoginController extends AbstractController { private CodeRecordService codeRecordService; @Resource private SysConfigService sysConfigService; + + @Autowired + private StaffRoleService staffRoleService; @Resource private DhgjSmsUtil dhgjSmsUtil; @@ -71,7 +74,7 @@ public class SysLoginController extends AbstractController { private String environment; @Autowired - private StaffService staffService ; + private StaffService staffService; /** * 验证码 @@ -181,7 +184,7 @@ public class SysLoginController extends AbstractController { SysUserEntity user = sysUserService.queryByUserName(form.getUserName()); if (user == null) { StaffEntity staffEntity = staffService.selectByPhone(form.getUserName()); - if(staffEntity != null){ + if (staffEntity != null) { user = new SysUserEntity(); user.setPassword(staffEntity.getPassword()); user.setMobile(staffEntity.getMobile()); @@ -193,7 +196,7 @@ public class SysLoginController extends AbstractController { user.setUsername(staffEntity.getMobile()); user.setRealName(staffEntity.getName()); user.setUserNo(staffEntity.getMobile()); - }else{ + } else { return R.error("账号不存在!"); } } @@ -218,11 +221,15 @@ public class SysLoginController extends AbstractController { } //生成token，并保存到数据库 R r = sysUserTokenService.createToken(user); - return r; + Map map = staffRoleService.getRoleByUserId(user.getUserId()); + return r.put("data",map); } + + + /** * 退出 */ diff --git a/src/main/resources/mapper/flow/RecordAuthMapper.xml b/src/main/resources/mapper/flow/RecordAuthMapper.xml index 9caa989b..b2ac68e3 100644 --- a/src/main/resources/mapper/flow/RecordAuthMapper.xml +++ b/src/main/resources/mapper/flow/RecordAuthMapper.xml @@ -108,5 +108,14 @@ + + + diff --git a/src/main/resources/mapper/flow/StaffRoleMapper.xml b/src/main/resources/mapper/flow/StaffRoleMapper.xml index 1b9b9d66..fce0e7eb 100644 --- a/src/main/resources/mapper/flow/StaffRoleMapper.xml +++ b/src/main/resources/mapper/flow/StaffRoleMapper.xml @@ -159,6 +159,17 @@ select * from lz_staff_role where is_delete = 0 and department_level = #{departmentLevel} and staff_id =#{staffId} + + + + +