!222 bug修复

Merge pull request !222 from reset/feature/cl

src/com/engine/organization/mapper/scheme/SchemeMapper.xml

@@ -76,7 +76,7 @@
     <select id="getTreeData" resultMap="TreeResultMap">
         select id, scheme_name
         from jcl_org_scheme
-        where delete_type = '0'
+        where delete_type = '0' and forbidden_tag = 0
     </select>
     <select id="getSchemesByIds" resultMap="BaseResultMap">
         select

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

@@ -127,6 +127,8 @@ public class GradeServiceImpl extends Service implements GradeService {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
+        String id = Util.null2String(params.get("id"));
+        String schemeId = Util.null2String(params.get("schemeId"));
         SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "gradeName");
         gradeNameCondition.setRules("required|string");
         SearchConditionItem gradeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "gradeNo");
@@ -134,11 +136,17 @@ public class GradeServiceImpl extends Service implements GradeService {
         SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
         SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
         schemeBrowserItem.setRules("required|string");
+        BrowserBean schemeBrowserBean = schemeBrowserItem.getBrowserConditionParam();
+        if (!"-1".equals(schemeId) && StringUtil.isEmpty(id)) {
+            schemeBrowserBean.setValue(schemeId);
+            List<Map<String, Object>> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(schemeId).build().getIds());
+            schemeBrowserBean.setReplaceDatas(maps);
+            schemeBrowserItem.setBrowserConditionParam(schemeBrowserBean);
+        }
         SearchConditionItem levelBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职等", "162", "levelId", "LevelBrowser");
         levelBrowserItem.setRules("required|string");
 
         // 编辑状态下赋值操作
-        String id = Util.null2String(params.get("id"));
         if (!StringUtil.isEmpty(id)) {
             GradePO gradePO = getGradeMapper().getGradeByID(Integer.parseInt(id));
             OrganizationAssert.notNull(gradePO, "选择的数据不存在，或数据已删除");
@@ -149,7 +157,6 @@ public class GradeServiceImpl extends Service implements GradeService {
             schemeBrowserItem.setValue(gradePO.getSchemeId());
             levelBrowserItem.setValue(gradePO.getLevelId());
 
-            BrowserBean schemeBrowserBean = schemeBrowserItem.getBrowserConditionParam();
             List<Map<String, Object>> schemeMaps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(gradePO.getSchemeId().toString()).build().getIds());
             schemeBrowserBean.setReplaceDatas(schemeMaps);
             schemeBrowserItem.setBrowserConditionParam(schemeBrowserBean);

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

@@ -124,15 +124,23 @@ public class LevelServiceImpl extends Service implements LevelService {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
+        String id = Util.null2String(params.get("id"));
+        String schemeId = Util.null2String(params.get("schemeId"));
         SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "levelName");
         levelNameCondition.setRules("required|string");
         SearchConditionItem levelNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "levelNo");
         levelNoCondition.setRules("required|string");
         SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
         SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
+        BrowserBean browserBean = browserItem.getBrowserConditionParam();
+        if (!"-1".equals(schemeId) && StringUtil.isEmpty(id)) {
+            browserItem.setValue(schemeId);
+            List<Map<String, Object>> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(schemeId).build().getIds());
+            browserBean.setReplaceDatas(maps);
+            browserItem.setBrowserConditionParam(browserBean);
+        }
         browserItem.setRules("required|string");
         // 编辑状态下赋值操作
-        String id = Util.null2String(params.get("id"));
         if (!StringUtil.isEmpty(id)) {
             LevelPO levelPO = getLevelMapper().getLevelByID(Integer.parseInt(id));
             OrganizationAssert.notNull(levelPO, "选择的数据不存在，或数据已删除");
@@ -142,7 +150,6 @@ public class LevelServiceImpl extends Service implements LevelService {
             descriptionCondition.setValue(levelPO.getDescription());
             browserItem.setValue(levelPO.getSchemeId());
 
-            BrowserBean browserBean = browserItem.getBrowserConditionParam();
             List<Map<String, Object>> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(levelPO.getSchemeId().toString()).build().getIds());
 
             browserBean.setReplaceDatas(maps);

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

@@ -136,6 +136,10 @@ public class SchemeWrapper extends OrganizationWrapper {
         return getSchemeService(user).getTableBtn();
     }
 
+    /**
+     * 等级方案树
+     * @return
+     */
     public List<TypeTreeVO> getTreeData() {
         return getSchemeService(user).getTreeData();
     }