BUG修复

docs/0829/Mysql.sql

@@ -35,3 +35,5 @@ DROP TRIGGER IF EXISTS JCL_ORG_job_ed;
 DROP TRIGGER IF EXISTS JCL_ORG_job_del;
 DROP TRIGGER IF EXISTS hrmresource_ed;
 DROP TRIGGER IF EXISTS cus_fielddata_jclgw;
+
+update WORKFLOW_BROWSERURL set TYPEID = 2 where id ='666';

docs/0829/Oracle.sql

@@ -123,3 +123,6 @@ if V_NUM > 0 then
 end if;
 END;
 /
+
+update WORKFLOW_BROWSERURL set TYPEID = 2 where id ='666'
+/

docs/0829/SqlServer.sql

@@ -1,5 +1,7 @@
 alter table JCL_ORG_STAFFS add  description varchar(200)
 GO
+update WORKFLOW_BROWSERURL set TYPEID = 2 where id ='666'
+GO
 
 IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_ITEMCLASS]') AND type IN ('U'))
 DROP TABLE [dbo].[JCL_ORG_ITEMCLASS]
@@ -50,30 +52,3 @@ ALTER TABLE [dbo].[JCL_ORG_ITEM] ADD CONSTRAINT [JCL_ORG_ITEM_PK] PRIMARY KEY CL
 GO
 
 
-IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[HrmCompany_ed]') AND type IN ('TR'))
-DROP TRIGGER [dbo].[HrmCompany_ed]
-GO
-IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_COMP_ed]') AND type IN ('TR'))
-DROP TRIGGER [dbo].[JCL_ORG_COMP_ed]
-GO
-IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_COMP_del]') AND type IN ('TR'))
-DROP TRIGGER [dbo].[JCL_ORG_COMP_del]
-GO
-IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_dept_ed]') AND type IN ('TR'))
-DROP TRIGGER [dbo].[JCL_ORG_dept_ed]
-GO
-IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_dept_del]') AND type IN ('TR'))
-DROP TRIGGER [dbo].[JCL_ORG_dept_del]
-GO
-IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_job_ed]') AND type IN ('TR'))
-DROP TRIGGER [dbo].[JCL_ORG_job_ed]
-GO
-IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[JCL_ORG_job_del]') AND type IN ('TR'))
-DROP TRIGGER [dbo].[JCL_ORG_job_del]
-GO
-IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[hrmresource_ed]') AND type IN ('TR'))
-DROP TRIGGER [dbo].[hrmresource_ed]
-GO
-IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[cus_fielddata_jclgw]') AND type IN ('TR'))
-DROP TRIGGER [dbo].[cus_fielddata_jclgw]
-GO

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

@@ -137,7 +137,7 @@ public class GradeServiceImpl extends Service implements GradeService {
         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)) {
+        if (StringUtils.isNotBlank(schemeId) && !"-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);

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

@@ -133,7 +133,7 @@ public class LevelServiceImpl extends Service implements LevelService {
         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)) {
+        if (StringUtils.isNotBlank(schemeId) && !"-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);

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

@@ -43,7 +43,8 @@ public class NonStandardOptServiceImpl extends Service implements NonStandardOpt
         // 更新人员表系统字段
         rs.executeUpdate("update hrm_formfield set isuse=1,ismand=1,allowhide=-1 where fieldname='sex'");
         rs.executeUpdate("update hrm_formfield set isuse=1,ismand=0,allowhide=-1 where fieldname='departmentid'");
-        rs.executeUpdate("update hrm_formfield set isuse=1,ismand=0,allowhide=-1 where fieldname='jobtitle'");
+        // 非标启用，停用EC岗位字段
+        rs.executeUpdate("update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobtitle'");
         rs.executeUpdate("update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobactivity'");
         rs.executeUpdate("update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='joblevel'");
         rs.executeUpdate("update hrm_formfield set isuse=0,ismand=0,allowhide=-1 where fieldname='jobcall'");