BUG修复，权限控制

src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java

@@ -83,7 +83,9 @@ public class ExtendGroupBO {
         }
 
         if (extendGroupPO.getIsSystemDefault() == 0) {
-
+            if (null != extendGroupPO.getPid()) {
+                tableName += "EXT_DT1";
+            }
         } else if (null == extendGroupPO.getPid()) {
             tableName += "EXT";
         } else {

src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java

@@ -1,8 +1,7 @@
 package com.engine.organization.entity.postion.vo;
 
-import com.engine.organization.annotation.OrganizationTable;
-import com.engine.organization.annotation.OrganizationTableColumn;
-import com.engine.organization.annotation.OrganizationTableOperate;
+import com.cloudstore.eccom.pc.table.WeaTableType;
+import com.engine.organization.annotation.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -27,6 +26,7 @@ import lombok.NoArgsConstructor;
                 " t.post_info_qualification," +
                 " a.post_name," +
                 " t.description," +
+                "t.is_used," +
                 " t.forbidden_tag",
         fromSql = " from jcl_org_post_info t inner join jcl_org_post a on t.post_id = a.id ",
         orderby = "post_info_no",
@@ -35,7 +35,9 @@ import lombok.NoArgsConstructor;
         operates = {
                 @OrganizationTableOperate(index = "0", text = "编辑"),
                 @OrganizationTableOperate(index = "1", text = "删除")
-        }
+        }, tableType = WeaTableType.CHECKBOX,
+        operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"),
+        checkboxPopedom = @CheckboxPopedom(showmethod = "com.engine.organization.util.ConfigTrans.getCheckBoxPopedom", popedompara = "column:is_used")
 )
 public class PostInfoTableVO {
     /**

src/com/engine/organization/mapper/post/PostInfoMapper.java

@@ -77,4 +77,11 @@ public interface PostInfoMapper {
 
 
     List<PostInfoPO> getPostInfosByIds(@Param("ids") Collection<Long> ids);
+
+    /**
+     * 查询所有被引用的ID
+     *
+     * @return
+     */
+    List<String> listUsedId();
 }

src/com/engine/organization/mapper/post/PostInfoMapper.xml

@@ -74,6 +74,11 @@
             #{id}
         </foreach>
     </select>
+    <select id="listUsedId" resultType="java.lang.String">
+        select post_info_id
+        from JCL_ORG_JOBEXT_DT1
+        where delete_type = 0
+    </select>
 
     <update id="updatePostInfo" parameterType="com.engine.organization.entity.postion.po.PostInfoPO">
         update jcl_org_post_info
@@ -168,7 +173,8 @@
         </trim>
     </insert>
 
-    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.postion.po.PostInfoPO" databaseId="oracle">
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.postion.po.PostInfoPO"
+            databaseId="oracle">
         <selectKey keyProperty="id" resultType="long" order="AFTER">
             select JCL_ORG_POST_INFO_ID.currval from dual
         </selectKey>

src/com/engine/organization/service/ImportCommonService.java

@@ -41,4 +41,6 @@ public interface ImportCommonService {
      */
     Map<String, Object> getImportResult(Map<String, Object> params);
 
+    Map<String, Object> getHasRight();
+
 }

src/com/engine/organization/service/OrgChartService.java

@@ -20,4 +20,6 @@ public interface OrgChartService {
     Map<String, Object> asyncUserData(Map<String, Object> request2Map, User user);
 
     Map<String, Object> asyncCompanyData(Map<String, Object> request2Map, User user);
+
+    Map<String, Object> getHasRight();
 }

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

@@ -23,6 +23,7 @@ import com.engine.organization.mapper.extend.ExtendGroupMapper;
 import com.engine.organization.mapper.extend.ExtendInfoMapper;
 import com.engine.organization.mapper.extend.ExtendTitleMapper;
 import com.engine.organization.service.FieldDefinedService;
+import com.engine.organization.util.HasRightUtil;
 import com.engine.organization.util.OrganizationAssert;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.collections.CollectionUtils;
@@ -229,6 +230,28 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
     @Override
     public Map<String, Object> getFieldDefinedInfo(ExtendFieldSearchParam param) {
         Map<String, Object> returnMap = new HashMap<>();
+        Long groupType = param.getGroupType();
+        ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(groupType);
+        String rightName = "";
+        switch (extendGroupPO.getExtendType()) {
+            case 1:
+                rightName = "CompanyField:All";
+                break;
+            case 2:
+                rightName = "DepartmentField:All";
+                break;
+            case 3:
+                rightName = "PostField:All";
+                break;
+            default:
+                break;
+        }
+        boolean hasRight = HasRightUtil.hasRight(user, rightName, true);
+        returnMap.put("hasRight", hasRight);
+        if (!hasRight) {
+            return returnMap;
+        }
+
         List<Map<String, Object>> lsFieldInfo = new ArrayList<>();
         Map<String, Object> fieldInfo;
         Map<String, Object> recordInfo;
@@ -238,8 +261,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
         List<Object> lsComDetialInfo;
         Map<String, Object> comDetialInfo;
         // 区分主表明细表
-        Long groupType = param.getGroupType();
-        ExtendGroupPO extendGroupPO = getExtendGroupMapper().getGroupById(groupType);
+
         String tableName = ExtendGroupBO.getTableNameByGroupPO(extendGroupPO);
         List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields("", param.getGroupId().toString(), tableName, "", "");
         for (ExtendInfoPO extendInfoPO : infoPOList) {

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

@@ -30,6 +30,7 @@ import com.engine.organization.mapper.jclimport.JclImportHistoryMapper;
 import com.engine.organization.mapper.job.JobMapper;
 import com.engine.organization.service.ImportCommonService;
 import com.engine.organization.thread.OrganizationRunable;
+import com.engine.organization.util.HasRightUtil;
 import com.engine.organization.util.OrganizationAssert;
 import com.engine.organization.util.db.MapperProxyFactory;
 import com.engine.organization.util.excel.ExcelUtil;
@@ -73,6 +74,8 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
     private static final Long DEPARTMENT_TYPE = 2L;
     private static final Long JOB_TYPE = 3L;
 
+    private static final String RIGHT_NAME = "DataImport:All";
+
 
     private ExtendInfoMapper getExtendInfoMapper() {
         return MapperProxyFactory.getProxy(ExtendInfoMapper.class);
@@ -212,6 +215,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                     returnMap.put("pId", jobImport(operateType, excelFile));
                     break;
                 case "resource":
+                    Long importHistoryId = saveImportLog("resource", operateType);
                     List<Object> lsErrorInfo = new ArrayList<>();
                     HrmImportAdaptExcelE9 importAdapt = new HrmImportAdaptExcelE9();
                     FileUploadToPath fu = new FileUploadToPath(request);
@@ -223,9 +227,8 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                         Map<String, HrmResourceVo> hrMap = importAdapt.getHrmImportMap();
 
                         HrmImportProcessE9 importProcess = new HrmImportProcessE9();
-                        Map<String, Object> map = importProcess.init(request);
-                        int pId = Util.getIntValue(Util.null2String(map.get("pId")));
-                        returnMap.put("pId", pId);
+                        importProcess.init(request, importHistoryId);
+
 
                         importProcess.processMap(hrMap);
                     } else {
@@ -234,8 +237,10 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                             error = new HashMap<>();
                             error.put("message", Util.null2String(errorInfo.get(i)));
                             lsErrorInfo.add(error);
+                            MapperProxyFactory.getProxy(JclImportHistoryDetailMapper.class).insertHistoryDetail(JclImportHistoryDetailPO.builder().pid(importHistoryId).operateDetail(Util.null2String(errorInfo.get(i))).status("0").build());
                         }
                     }
+                    returnMap.put("pId", importHistoryId);
                     break;
                 default:
                     break;
@@ -264,6 +269,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
         return resultMap;
     }
 
+    @Override
+    public Map<String, Object> getHasRight() {
+        Map<String, Object> returnMap = new HashMap<>();
+        boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
+        returnMap.put("hasRight", hasRight);
+        return returnMap;
+    }
+
 
     /**
      * 分部导入表单
@@ -1083,8 +1096,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
     }
 
 
-
-
     /**
      * 读取表格文本内容
      */

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

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import com.engine.core.impl.Service;
 import com.engine.organization.service.OrgChartService;
+import com.engine.organization.util.HasRightUtil;
 import com.engine.organization.util.db.DBType;
 import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
@@ -20,6 +21,7 @@ import java.util.*;
 public class OrgChartServiceImpl extends Service implements OrgChartService {
 
     private RecordSet grs = new RecordSet();
+    private static final String RIGHT_NAME = "OrgChart:All";
 
     @Override
     public Map<String, Object> getOptionCondition(Map<String, Object> request2Map, User user) {
@@ -321,6 +323,14 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         return result;
     }
 
+    @Override
+    public Map<String, Object> getHasRight() {
+        Map<String, Object> returnMap = new HashMap<>();
+        boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
+        returnMap.put("hasRight", hasRight);
+        return returnMap;
+    }
+
     private void findUserItemByParantId(String id, int currentLevel, String level, RecordSet rs, List<Map<String, Object>> list, String whereSql, boolean expand) {
         rs.executeQuery("select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber from jcl_org_map t " + whereSql + " and t.fparentid = " + id);
         List<Map<String, Object>> currentList = new ArrayList<>();

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

@@ -14,10 +14,7 @@ import com.engine.organization.entity.postion.vo.PostInfoTableVO;
 import com.engine.organization.mapper.post.PostInfoMapper;
 import com.engine.organization.mapper.post.PostMapper;
 import com.engine.organization.service.PostInfoService;
-import com.engine.organization.util.HasRightUtil;
-import com.engine.organization.util.MenuBtn;
-import com.engine.organization.util.OrganizationAssert;
-import com.engine.organization.util.OrganizationFormItemUtil;
+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;
@@ -53,6 +50,8 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
         if (!hasRight) {
             return resultMap;
         }
+        // 刷新引用状态
+        RefreshIsUsedUtil.RefreshPostInfo("jcl_org_post_info");
         OrganizationWeaTable<PostInfoTableVO> table = new OrganizationWeaTable<>(user, PostInfoTableVO.class);
         String sqlWhere = buildSqlWhere(params);
         table.setSqlwhere(sqlWhere);

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

@@ -88,6 +88,7 @@ public class StaffServiceImpl extends Service implements StaffService {
     public int saveStaff(StaffSearchParam param) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         StaffPO staffPO = StaffBO.convertParamToPO(param, (long) user.getUID());
+        OrganizationAssert.isFalse(staffPO.getStaffNum() < 0, "编制数不可小于0，请更正");
         checkRequired(staffPO);
         return getStaffMapper().insertIgnoreNull(staffPO);
     }

src/com/engine/organization/util/RefreshIsUsedUtil.java

@@ -1,6 +1,7 @@
 package com.engine.organization.util;
 
 import com.engine.organization.mapper.common.RefreshUseMapper;
+import com.engine.organization.mapper.post.PostInfoMapper;
 import com.engine.organization.mapper.scheme.GradeMapper;
 import com.engine.organization.mapper.scheme.LevelMapper;
 import com.engine.organization.mapper.scheme.SchemeMapper;
@@ -95,6 +96,17 @@ public class RefreshIsUsedUtil {
     }
 
 
+    /**
+     * 刷新职务信息
+     * <p>
+     * JCL_ORG_JOBEXT_DT1
+     */
+    public static void RefreshPostInfo(String tableName) {
+        List<String> usedIds = MapperProxyFactory.getProxy(PostInfoMapper.class).listUsedId();
+        usedIds.removeIf(Objects::isNull);
+        RefreshIsUsedStatus(tableName, usedIds);
+    }
+
     /**
      * 更新指定表的引用状态
      *

src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java

@@ -11,7 +11,6 @@ import com.engine.hrm.util.face.HrmFaceCheckManager;
 import com.engine.hrm.util.face.ValidateFieldManager;
 import com.engine.hrm.util.face.bean.CheckItemBean;
 import com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO;
-import com.engine.organization.entity.jclimport.po.JclImportHistoryPO;
 import com.engine.organization.mapper.jclimport.JclImportHistoryDetailMapper;
 import com.engine.organization.mapper.jclimport.JclImportHistoryMapper;
 import com.engine.organization.trigger.cusfielddata.CusFieldDataTrigger;
@@ -21,7 +20,6 @@ import com.weaver.integration.ldap.util.AuthenticUtil;
 import ln.LN;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
-import weaver.common.DateUtil;
 import weaver.common.StringUtil;
 import weaver.conn.RecordSet;
 import weaver.conn.RecordSetTrans;
@@ -118,7 +116,7 @@ public class HrmImportProcessE9 extends BaseBean {
         this.user = user;
     }
 
-    public Map<String, Object> init(HttpServletRequest request) {
+    public Map<String, Object> init(HttpServletRequest request, Long importHistoryId) {
         Map<String, Object> retmap = new HashMap<>();
         try {
             this.user = (User) request.getSession(true).getAttribute("weaver_user@bean");
@@ -127,10 +125,7 @@ public class HrmImportProcessE9 extends BaseBean {
 
             Map<String, Object> params = ParamUtil.request2Map(request);
             params.put("operateType", this.operateType);
-            JclImportHistoryPO historyPO = JclImportHistoryPO.builder().operator((long) user.getUID()).operateTime(DateUtil.getFullDate()).clientAddress(user.getLoginip()).importType("resource").sourceFrom("excel").operateType(operateType).status("importing").build();
-            MapperProxyFactory.getProxy(JclImportHistoryMapper.class).insertHistory(historyPO);
-            retmap.put("pId", historyPO.getId());
-            this.pId = Util.getIntValue(Util.null2String(retmap.get("pId")));
+            this.pId = importHistoryId.intValue();
 
 
             LN license = new LN();

src/com/engine/organization/web/ImportCommonController.java

@@ -85,4 +85,16 @@ public class ImportCommonController {
             return ReturnResult.exceptionHandle(e);
         }
     }
+
+    @GET
+    @Path("/getHasRight")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            return ReturnResult.successed(getImportCommonWrapper(user).getHasRight());
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e);
+        }
+    }
 }

src/com/engine/organization/web/OrgChartController.java

@@ -3,6 +3,7 @@ package com.engine.organization.web;
 import com.alibaba.fastjson.JSONObject;
 import com.engine.common.util.ParamUtil;
 import com.engine.common.util.ServiceUtil;
+import com.engine.organization.util.response.ReturnResult;
 import com.engine.organization.wrapper.OrgChartWrapper;
 import weaver.hrm.HrmUserVarify;
 import weaver.hrm.User;
@@ -30,7 +31,7 @@ public class OrgChartController {
 
     /**
      * 获取组织维度信息
-     * */
+     */
     @GET
     @Path("/getCondition")
     @Produces(MediaType.APPLICATION_JSON)
@@ -53,7 +54,7 @@ public class OrgChartController {
 
     /**
      * 组织架构数据
-     * */
+     */
     @GET
     @Path("/companyData")
     @Produces(MediaType.APPLICATION_JSON)
@@ -76,7 +77,7 @@ public class OrgChartController {
 
     /**
      * 组织透视图
-     * */
+     */
     @GET
     @Path("/userData")
     @Produces(MediaType.APPLICATION_JSON)
@@ -143,4 +144,17 @@ public class OrgChartController {
         return JSONObject.toJSONString(apidatas);
     }
 
+    @GET
+    @Path("/getHasRight")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        // TODO  权限控制调整
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            return ReturnResult.successed(getOrgChartWrapper(user).getHasRight());
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e);
+        }
+    }
+
 }

src/com/engine/organization/wrapper/ImportCommonWrapper.java

@@ -61,4 +61,8 @@ public class ImportCommonWrapper extends Service {
     public Map<String, Object> getImportResult(Map<String, Object> params) {
         return getImportCommonService(user).getImportResult(params);
     }
+
+    public Map<String, Object> getHasRight() {
+        return getImportCommonService(user).getHasRight();
+    }
 }

src/com/engine/organization/wrapper/OrgChartWrapper.java

@@ -39,4 +39,8 @@ public class OrgChartWrapper extends Service {
     public Map<String, Object> asyncCompanyData(Map<String, Object> request2Map, User user) {
         return getOrgChartService(user).asyncCompanyData(request2Map, user);
     }
+
+    public Map<String, Object> getHasRight(){
+        return getOrgChartService(user).getHasRight();
+    }
 }