!64 权限管理 BUG修复

Merge pull request !64 from dxfeng/feature/dxf

src/com/engine/organization/entity/staff/param/StaffSearchParam.java

@@ -65,4 +65,9 @@ public class StaffSearchParam {
      * 说明
      */
     private String description;
+
+    /**
+     * 方案名称
+     */
+    private String staffName;
 }

src/com/engine/organization/service/impl/CompServiceImpl.java

@@ -169,7 +169,6 @@ public class CompServiceImpl extends Service implements CompService {
 
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
@@ -212,7 +211,6 @@ public class CompServiceImpl extends Service implements CompService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         return MenuBtn.getDatasNoBtnColum();
     }
 

src/com/engine/organization/service/impl/DepartmentServiceImpl.java

@@ -95,7 +95,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
 
     @Override
     public PageInfo<SingleDeptTreeVO> getDeptListByPid(QuerySingleDeptListParam param) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         //1.查询分部下所有部门
         //PageUtil.start(param.getCurrent(), param.getPageSize());
         List<DepartmentPO> departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).list();
@@ -111,7 +110,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
 
     @Override
     public PageInfo<SingleJobTreeVO> getJobListByPid(QuerySingleDeptListParam param) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         List<JobPO> jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listAll();
         PageInfo<JobPO> pageInfo = new PageInfo<>(jobPOS);
         List<SingleJobTreeVO> singleDeptTreeVOS = JobBO.buildSingleJobTreeVOS(jobPOS, param.getParentDept());
@@ -125,7 +123,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
 
     @Override
     public Map<String, Object> getSearchTree(SearchTreeParams params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         String keyword = params.getKeyword();
         String id = params.getId();
         String type = Util.null2String(params.getType());
@@ -224,7 +221,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
 
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
@@ -266,7 +262,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
 
     @Override
     public Map<String, Object> getHasRight() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         return MenuBtn.getDatasHasCopy();
     }
 

src/com/engine/organization/service/impl/GradeServiceImpl.java

@@ -103,7 +103,6 @@ public class GradeServiceImpl extends Service implements GradeService {
 
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
@@ -171,13 +170,11 @@ public class GradeServiceImpl extends Service implements GradeService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         return MenuBtn.getCommonBtnDatas();
     }
 
     @Override
     public Map<String, Object> getTabInfo() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<TopTab> topTabs = new ArrayList<>();
         topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build());

src/com/engine/organization/service/impl/GroupServiceImpl.java

@@ -89,7 +89,6 @@ public class GroupServiceImpl extends Service implements GroupService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
@@ -104,7 +103,6 @@ public class GroupServiceImpl extends Service implements GroupService {
 
     @Override
     public Map<String, Object> getTabInfo() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<TopTab> topTabs = new ArrayList<>();
         topTabs.add(TopTab.builder().title("总部信息").viewCondition("1").build());

src/com/engine/organization/service/impl/JobServiceImpl.java

@@ -129,7 +129,6 @@ public class JobServiceImpl extends Service implements JobService {
 
     @Override
     public Map<String, Object> getSearchTree(SearchTreeParams params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         String keyword = params.getKeyword();
         String id = params.getId();
         String type = Util.null2String(params.getType());
@@ -186,13 +185,11 @@ public class JobServiceImpl extends Service implements JobService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         return MenuBtn.getDatasHasCopy();
     }
 
     @Override
     public Map<String, Object> getSearchCondition() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();

src/com/engine/organization/service/impl/LevelServiceImpl.java

@@ -98,7 +98,6 @@ public class LevelServiceImpl extends Service implements LevelService {
 
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
@@ -157,13 +156,11 @@ public class LevelServiceImpl extends Service implements LevelService {
 
     @Override
     public Map<String, Object> getTableBtn() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         return MenuBtn.getCommonBtnDatas();
     }
 
     @Override
     public Map<String, Object> getTabInfo() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<TopTab> topTabs = new ArrayList<>();
         topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build());

src/com/engine/organization/service/impl/PostInfoServiceImpl.java

@@ -99,7 +99,6 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
 
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
@@ -173,7 +172,6 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         return MenuBtn.getCommonBtnDatas();
     }
 

src/com/engine/organization/service/impl/PostServiceImpl.java

@@ -86,7 +86,6 @@ public class PostServiceImpl extends Service implements PostService {
 
     @Override
     public TreeData getTreeData() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         ArrayList<TreeData> treeDataList = getPostMapper().getTreeData();
         return TreeData.builder().children(treeDataList).title("全部类型").key("-1").build();
     }

src/com/engine/organization/service/impl/SchemeServiceImpl.java

@@ -94,7 +94,6 @@ public class SchemeServiceImpl extends Service implements SchemeService {
 
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
@@ -143,7 +142,6 @@ public class SchemeServiceImpl extends Service implements SchemeService {
 
     @Override
     public Map<String, Object> getTableBtn() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         return MenuBtn.getCommonBtnDatas();
     }
 

src/com/engine/organization/service/impl/SequenceServiceImpl.java

@@ -98,7 +98,6 @@ public class SequenceServiceImpl extends Service implements SequenceService {
 
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
@@ -157,13 +156,11 @@ public class SequenceServiceImpl extends Service implements SequenceService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         return MenuBtn.getCommonBtnDatas();
     }
 
     @Override
     public Map<String, Object> getTabInfo() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<TopTab> topTabs = new ArrayList<>();
         topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build());

src/com/engine/organization/service/impl/StaffPlanServiceImpl.java

@@ -19,6 +19,7 @@ import com.engine.organization.util.*;
 import com.engine.organization.util.db.DBType;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.lang3.StringUtils;
+import weaver.common.DateUtil;
 import weaver.conn.RecordSet;
 import weaver.general.StringUtil;
 import weaver.general.Util;
@@ -96,7 +97,6 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
 
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
@@ -173,8 +173,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
             planNoItem.setValue(staffPlanPO.getPlanNo());
             planNameItem.setValue(staffPlanPO.getPlanName());
             planYearItem.setValue(staffPlanPO.getPlanYear() + "");
-            timeStartItem.setValue(staffPlanPO.getTimeStart() + "");
+            timeStartItem.setValue(DateUtil.getDate(staffPlanPO.getTimeStart()));
-            timeEndItem.setValue(staffPlanPO.getTimeEnd() + "");
+            timeEndItem.setValue(DateUtil.getDate(staffPlanPO.getTimeEnd()));
 
             BrowserBean browserBean = companyIdtItem.getBrowserConditionParam();
             List<Map<String, Object>> maps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(staffPlanPO.getCompanyId()).build().getIds());
@@ -201,7 +201,6 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         return MenuBtn.getCommonBtnDatas();
     }
 

src/com/engine/organization/service/impl/StaffServiceImpl.java

@@ -70,8 +70,7 @@ public class StaffServiceImpl extends Service implements StaffService {
         // 刷新引用状态
         RefreshIsUsedUtil.RefreshStaff("jcl_org_staff");
         OrganizationWeaTable<StaffTableVO> table = new OrganizationWeaTable<>(user, StaffTableVO.class);
-        StaffPO staffPO = StaffBO.convertParamToPO(params, (long) user.getUID());
+        String sqlWhere = buildSqlWhere(params);
-        String sqlWhere = buildSqlWhere(staffPO);
         table.setSqlwhere(sqlWhere);
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
@@ -104,7 +103,6 @@ public class StaffServiceImpl extends Service implements StaffService {
 
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
@@ -229,64 +227,67 @@ public class StaffServiceImpl extends Service implements StaffService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        HasRightUtil.hasRight(user, RIGHT_NAME, false);
         return MenuBtn.getCommonBtnDatas();
     }
 
     /**
      * 查询条件
      *
-     * @param staffPO
+     * @param param
      * @return
      */
-    private String buildSqlWhere(StaffPO staffPO) {
+    private String buildSqlWhere(StaffSearchParam param) {
         DBType dbType = DBType.get(new RecordSet().getDBType());
         String sqlWhere = " where t.delete_type ='0' ";
 
-        Long planId = staffPO.getPlanId();
+        Long planId = param.getPlanId();
         if (null != planId) {
             sqlWhere += " AND t.plan_id = '" + planId + "'";
         }
-        Long compId = staffPO.getCompId();
+        Long compId = param.getCompId();
         if (null != compId) {
             sqlWhere += " AND t.comp_id = '" + compId + "'";
         }
-        Long deptId = staffPO.getDeptId();
+        Long deptId = param.getDeptId();
         if (null != deptId) {
             sqlWhere += " AND t.dept_id = '" + deptId + "'";
         }
-        Long jobId = staffPO.getJobId();
+        Long jobId = param.getJobId();
         if (null != jobId) {
             sqlWhere += " AND t.job_id = '" + jobId + "'";
         }
-        Integer staffNum = staffPO.getStaffNum();
+        Integer staffNum = param.getStaffNum();
         if (null != staffNum) {
             sqlWhere += " AND t.staff_num = '" + staffNum + "'";
         }
-        Integer controlPolicy = staffPO.getControlPolicy();
+        Integer controlPolicy = param.getControlPolicy();
         if (null != controlPolicy) {
             sqlWhere += " AND t.control_policy = '" + controlPolicy + "'";
         }
-        Integer permanentNum = staffPO.getPermanentNum();
+        Integer permanentNum = param.getPermanentNum();
         if (null != permanentNum) {
             sqlWhere += " AND t.permanent_num = '" + permanentNum + "'";
         }
-        Integer freezeNum = staffPO.getFreezeNum();
+        Integer freezeNum = param.getFreezeNum();
         if (null != freezeNum) {
             sqlWhere += " AND t.freeze_num = '" + freezeNum + "'";
         }
-        Integer lackStatus = staffPO.getLackStatus();
+        Integer lackStatus = param.getLackStatus();
         if (null != lackStatus) {
             sqlWhere += " AND t.lack_status = '" + lackStatus + "'";
         }
-        String staffDesc = staffPO.getStaffDesc();
+        String staffDesc = param.getStaffDesc();
         if (StringUtils.isNotBlank(staffDesc)) {
             sqlWhere += " AND t.staff_desc " + dbType.like(staffDesc);
         }
-        String description = staffPO.getDescription();
+        String description = param.getDescription();
         if (StringUtils.isNotBlank(description)) {
             sqlWhere += " AND t.description " + dbType.like(description);
         }
+        String staffName = param.getStaffName();
+        if (StringUtils.isNotBlank(staffName)) {
+            sqlWhere += " AND t.plan_id in ( select id from jcl_org_staffplan where plan_name " + dbType.like(staffName) + ") ";
+        }
 
         return sqlWhere;
     }