Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

src/main/java/com/lz/modules/app/controller/StaffRoleController.java

@@ -204,20 +204,21 @@ public class StaffRoleController {
         return R.ok();
     }
 
-    // http://localhost:8080/lz_management/user/lzstaffrole/role/set
+    // http://localhost:8080/lz_management/user/lzstaffrole/role/set?pageSize=100
     @RequestMapping("/role/set")
     public R roleSet(RoleModel roleModel) {
         return staffRoleService.selectRoleInfoBy(roleModel);
     }
 
     // http://localhost:8080/lz_management/user/lzstaffrole/role/detail?id=4
+    // http://localhost:8080/lz_management/user/lzstaffrole/role/detail
     @RequestMapping("/role/detail")
     public R roleDetail(RoleModel roleModel) {
         return staffRoleService.selectRoleDetail(roleModel);
     }
 
 
-    // 老板add :http://localhost:8080/lz_management/user/lzstaffrole/role/addOrUpdate?departmentLevel=BOSS&staffId=294
+    // 老板add :http://localhost:8080/lz_management/user/lzstaffrole/role/addOrUpdate?departmentLevel=MASTER_PM&staffId=395
     // 老板edit :http://localhost:8080/lz_management/user/lzstaffrole/role/addOrUpdate?id=24&staffId=294
     // 普通add: http://localhost:8080/lz_management/user/lzstaffrole/role/addOrUpdate?departmentLevel=CHILD_PM&staffId=28&evaluationGroupId=1&evaluationGroupInfoStr=2,3&departmentId=2&departmentInfoStr=154332270,379635019&selectStaffMenuInfoStr=15,17
     // 普通add: http://localhost:8080/lz_management/user/lzstaffrole/role/addOrUpdate?id=26&evaluationGroupId=1&evaluationGroupInfoStr=2,4&departmentId=2&departmentInfoStr=154332270,379635019&selectStaffMenuInfoStr=15,17

src/main/java/com/lz/modules/app/dto/StaffRoleInfo.java

@@ -11,9 +11,12 @@ public class StaffRoleInfo {
     private Long staffId;
     private int functionModel = 1;
     private Long departmentId;
+    private List<String> deparmentNames;
     private Long evaluationGroupId;
     //@ApiModelProperty(value = "0表示全部部门，1 所在部门及以下部门，2表示特定部门", name = "departmentId")
     private int canSee = 1;
     private List<String> menuNames;
+    private int menuId;
+
     private Long id ;
 }

src/main/java/com/lz/modules/flow/dao/StaffRoleMenuMapper.java

@@ -37,4 +37,6 @@ public interface StaffRoleMenuMapper extends BaseMapper<StaffRoleMenu> {
     List<StaffMenu> selectByRoleId(@Param("roleId") Long roleId);
 
     void deleteStaffRoleMenuByRoleId(@Param("roleId") Long roleId);
+
+    StaffRoleMenu selectStaffRoleMenuByRoleIdMenuId(@Param("roleId") Long roleId, @Param("menuId") long menuId);
 }

src/main/java/com/lz/modules/flow/service/StaffRoleMenuService.java

@@ -36,4 +36,6 @@ public interface StaffRoleMenuService extends IService<StaffRoleMenu> {
 	List<StaffMenu> selectByRoleId(Long id);
 
     void deleteStaffRoleMenuByRoleId(Long roleId);
+
+    StaffRoleMenu selectStaffRoleMenuByRoleIdMenuId(Long roleId, long menuId);
 }

src/main/java/com/lz/modules/flow/service/impl/StaffRoleMenuServiceImpl.java

@@ -71,5 +71,11 @@ public class StaffRoleMenuServiceImpl extends ServiceImpl<StaffRoleMenuMapper, S
 		staffRoleMenuMapper.deleteStaffRoleMenuByRoleId(roleId);
     }
 
+    @Override
+    public StaffRoleMenu selectStaffRoleMenuByRoleIdMenuId(Long roleId, long menuId) {
+
+		return staffRoleMenuMapper.selectStaffRoleMenuByRoleIdMenuId(roleId,menuId);
+    }
+
 
 }

src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java

@@ -89,6 +89,8 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
     @Autowired
     private StaffRoleEvaluationGroupService staffRoleEvaluationGroupService;
 
+
+
     @Autowired
     private StaffMenuService staffMenuService;
 
@@ -323,7 +325,19 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
             for (StaffMenu staffMenu : staffMenus) {
                 menuNames.add(staffMenu.getName());
             }
+            List<String> deparmentNames = new ArrayList<>();
+            if (staffRole.getDepartmentId().equals(new Long(2))) {
+                List<StaffRoleDepartment> staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId());
+                for(StaffRoleDepartment staffRoleDepartment:staffRoleDepartments){
+                    DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(staffRoleDepartment.getDepartmentId());
+                    deparmentNames.add(departmentsEntity.getDepartmentName());
+                }
+            }
+            StaffRoleMenu staffRoleMenu = staffRoleMenuService.selectStaffRoleMenuByRoleIdMenuId(staffRole.getId(), 1l);
+            staffRoleInfo.setMenuId(staffRoleMenu != null ? 0 : 1);
+            staffRoleInfo.setDeparmentNames(deparmentNames);
             staffRoleInfo.setMenuNames(menuNames);
+
             childPm.add(staffRoleInfo);
         }
         pageUtils.setList(childPm);
@@ -346,10 +360,10 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
 
     @Override
     public R selectRoleDetail(RoleModel roleModel) {
-        if (roleModel.getId() == null) {
+        StaffRole staffRole= staffRoleMapper.selectById(roleModel.getId());
-            return R.error("必需传入id");
+        if(staffRole == null ){
+            staffRole = new StaffRole();
         }
-        StaffRole staffRole = staffRoleMapper.selectById(roleModel.getId());
         StaffRoleDetailInfo info = new StaffRoleDetailInfo();
         BeanUtils.copyProperties(staffRole, info);
         List<StaffRoleDepartment> staffRoleDepartments = staffRoleDepartmentMapper.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId());

src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java

@@ -11,6 +11,7 @@ package com.lz.modules.sys.oauth2;
 import com.google.gson.Gson;
 import com.lz.common.utils.HttpContextUtils;
 import com.lz.common.utils.R;
+import com.lz.common.utils.SpringContextUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpStatus;
 import org.apache.shiro.authc.AuthenticationException;
@@ -56,6 +57,10 @@ public class OAuth2Filter extends AuthenticatingFilter {
     protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
         //获取请求token，如果token不存在，直接返回401
         String token = getRequestToken((HttpServletRequest) request);
+        String profile = SpringContextUtils.getActiveProfile();
+        if(!"prod".equals(profile) ){
+            return true;
+        }
         if(StringUtils.isBlank(token)){
             HttpServletResponse httpResponse = (HttpServletResponse) response;
             httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
@@ -67,8 +72,6 @@ public class OAuth2Filter extends AuthenticatingFilter {
             return false;
         }
         return executeLogin(request, response);
-//        return true;
-
     }
 
     @Override

src/main/resources/mapper/flow/StaffRoleMenuMapper.xml

@@ -80,11 +80,17 @@
         select * from lz_staff_menu where id in (select menu_id from lz_staff_role_menu where role_id = #{roleId})
     </select>
 
-
     <delete id="deleteStaffRoleMenuByRoleId">
         delete from lz_staff_role_menu where role_id = #{roleId}
     </delete>
 
 
+
+    <select id="selectStaffRoleMenuByRoleIdMenuId" resultType="com.lz.modules.flow.entity.StaffRoleMenu">
+        select * from lz_staff_role_menu where  is_delete = 1 and   role_id = #{roleId} and menu_id = #{menuId}
+    </select>
+
+
+
 </mapper>