manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理新增员工工号字典，并保持租户内唯一性验证；employee 新增 getByEmpNo 方法，cloud版升级注意

Browse Source
This commit is contained in:
thinkgem
2019-11-20 22:33:50 +08:00
parent 5677047365
commit 4f751c6620
12 changed files with 169 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.8.sql Normal file
View File

@@ -0,0 +1,7 @@
-- 员工表新增工号字段
ALTER TABLE ${_prefix}sys_employee ADD emp_no varchar(100) NULL;
-- 新增 BPM 模块
INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks)
VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', now(), 'system', now(), NULL);

8
modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.8.sql Normal file
View File

@@ -0,0 +1,8 @@
-- 员工表新增工号字段
ALTER TABLE `${_prefix}sys_employee`
ADD COLUMN `emp_no` varchar(100) NULL COMMENT '员工工号' AFTER `emp_code`;
-- 新增 BPM 模块
INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks)
VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', now(), 'system', now(), NULL);

44
modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.6.sql
View File

@@ -1,7 +1,7 @@
-- 菜单表增加菜单标题（页签的名字）
ALTER TABLE ${_prefix}sys_menu ADD menu_title varchar2(100) NULL;
COMMENT ON COLUMN js_sys_menu.menu_title IS '菜单标题';
COMMENT ON COLUMN ${_prefix}sys_menu.menu_title IS '菜单标题';
-- 角色业务范围字典数据
INSERT INTO ${_prefix}sys_dict_type(id, dict_name, dict_type, is_sys, status, create_by, create_date, update_by, update_date, remarks)
@@ -11,7 +11,7 @@ VALUES ('1149344606834356224', '0', '0,', 30, '0000000030,', '1', 0, '组织管
-- 角色表增加适应业务范围
ALTER TABLE ${_prefix}sys_role ADD biz_scope varchar2(255) NULL;
COMMENT ON COLUMN js_sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
COMMENT ON COLUMN ${_prefix}sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
-- 角色表增加 20 个扩展字段
ALTER TABLE ${_prefix}sys_role
@@ -35,23 +35,23 @@ ADD (extend_s1 nvarchar2(500),
extend_d2 timestamp,
extend_d3 timestamp,
extend_d4 timestamp);
COMMENT ON COLUMN js_sys_role.extend_s1 IS '扩展 String 1';
COMMENT ON COLUMN js_sys_role.extend_s2 IS '扩展 String 2';
COMMENT ON COLUMN js_sys_role.extend_s3 IS '扩展 String 3';
COMMENT ON COLUMN js_sys_role.extend_s4 IS '扩展 String 4';
COMMENT ON COLUMN js_sys_role.extend_s5 IS '扩展 String 5';
COMMENT ON COLUMN js_sys_role.extend_s6 IS '扩展 String 6';
COMMENT ON COLUMN js_sys_role.extend_s7 IS '扩展 String 7';
COMMENT ON COLUMN js_sys_role.extend_s8 IS '扩展 String 8';
COMMENT ON COLUMN js_sys_role.extend_i1 IS '扩展 Integer 1';
COMMENT ON COLUMN js_sys_role.extend_i2 IS '扩展 Integer 2';
COMMENT ON COLUMN js_sys_role.extend_i3 IS '扩展 Integer 3';
COMMENT ON COLUMN js_sys_role.extend_i4 IS '扩展 Integer 4';
COMMENT ON COLUMN js_sys_role.extend_f1 IS '扩展 Float 1';
COMMENT ON COLUMN js_sys_role.extend_f2 IS '扩展 Float 2';
COMMENT ON COLUMN js_sys_role.extend_f3 IS '扩展 Float 3';
COMMENT ON COLUMN js_sys_role.extend_f4 IS '扩展 Float 4';
COMMENT ON COLUMN js_sys_role.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_role.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_role.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_role.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s1 IS '扩展 String 1';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s2 IS '扩展 String 2';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s3 IS '扩展 String 3';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s4 IS '扩展 String 4';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s5 IS '扩展 String 5';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s6 IS '扩展 String 6';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s7 IS '扩展 String 7';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s8 IS '扩展 String 8';
COMMENT ON COLUMN ${_prefix}sys_role.extend_i1 IS '扩展 Integer 1';
COMMENT ON COLUMN ${_prefix}sys_role.extend_i2 IS '扩展 Integer 2';
COMMENT ON COLUMN ${_prefix}sys_role.extend_i3 IS '扩展 Integer 3';
COMMENT ON COLUMN ${_prefix}sys_role.extend_i4 IS '扩展 Integer 4';
COMMENT ON COLUMN ${_prefix}sys_role.extend_f1 IS '扩展 Float 1';
COMMENT ON COLUMN ${_prefix}sys_role.extend_f2 IS '扩展 Float 2';
COMMENT ON COLUMN ${_prefix}sys_role.extend_f3 IS '扩展 Float 3';
COMMENT ON COLUMN ${_prefix}sys_role.extend_f4 IS '扩展 Float 4';
COMMENT ON COLUMN ${_prefix}sys_role.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN ${_prefix}sys_role.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN ${_prefix}sys_role.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN ${_prefix}sys_role.extend_d4 IS '扩展 Date 4';

8
modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.8.sql Normal file
View File

@@ -0,0 +1,8 @@
-- 员工表新增工号字段
ALTER TABLE ${_prefix}sys_employee ADD emp_no varchar2(100) NULL;
COMMENT ON COLUMN ${_prefix}sys_employee.emp_no IS '员工工号';
-- 新增 BPM 模块
INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks)
VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', sysdate, 'system', sysdate, NULL);

44
modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.6.sql
View File

@@ -1,7 +1,7 @@
-- 菜单表增加菜单标题（页签的名字）
ALTER TABLE ${_prefix}sys_menu ADD menu_title varchar(100) NULL;
COMMENT ON COLUMN js_sys_menu.menu_title IS '菜单标题';
COMMENT ON COLUMN ${_prefix}sys_menu.menu_title IS '菜单标题';
-- 角色业务范围字典数据
INSERT INTO ${_prefix}sys_dict_type(id, dict_name, dict_type, is_sys, status, create_by, create_date, update_by, update_date, remarks)
@@ -11,7 +11,7 @@ VALUES ('1149344606834356224', '0', '0,', 30, '0000000030,', '1', 0, '组织管
-- 角色表增加适应业务范围
ALTER TABLE ${_prefix}sys_role ADD COLUMN biz_scope varchar(255) NULL;
COMMENT ON COLUMN js_sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
COMMENT ON COLUMN ${_prefix}sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
-- 角色表增加 20 个扩展字段
ALTER TABLE ${_prefix}sys_role
@@ -35,23 +35,23 @@ ADD COLUMN extend_d1 timestamp,
ADD COLUMN extend_d2 timestamp,
ADD COLUMN extend_d3 timestamp,
ADD COLUMN extend_d4 timestamp;
COMMENT ON COLUMN js_sys_role.extend_s1 IS '扩展 String 1';
COMMENT ON COLUMN js_sys_role.extend_s2 IS '扩展 String 2';
COMMENT ON COLUMN js_sys_role.extend_s3 IS '扩展 String 3';
COMMENT ON COLUMN js_sys_role.extend_s4 IS '扩展 String 4';
COMMENT ON COLUMN js_sys_role.extend_s5 IS '扩展 String 5';
COMMENT ON COLUMN js_sys_role.extend_s6 IS '扩展 String 6';
COMMENT ON COLUMN js_sys_role.extend_s7 IS '扩展 String 7';
COMMENT ON COLUMN js_sys_role.extend_s8 IS '扩展 String 8';
COMMENT ON COLUMN js_sys_role.extend_i1 IS '扩展 Integer 1';
COMMENT ON COLUMN js_sys_role.extend_i2 IS '扩展 Integer 2';
COMMENT ON COLUMN js_sys_role.extend_i3 IS '扩展 Integer 3';
COMMENT ON COLUMN js_sys_role.extend_i4 IS '扩展 Integer 4';
COMMENT ON COLUMN js_sys_role.extend_f1 IS '扩展 Float 1';
COMMENT ON COLUMN js_sys_role.extend_f2 IS '扩展 Float 2';
COMMENT ON COLUMN js_sys_role.extend_f3 IS '扩展 Float 3';
COMMENT ON COLUMN js_sys_role.extend_f4 IS '扩展 Float 4';
COMMENT ON COLUMN js_sys_role.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN js_sys_role.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN js_sys_role.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN js_sys_role.extend_d4 IS '扩展 Date 4';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s1 IS '扩展 String 1';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s2 IS '扩展 String 2';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s3 IS '扩展 String 3';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s4 IS '扩展 String 4';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s5 IS '扩展 String 5';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s6 IS '扩展 String 6';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s7 IS '扩展 String 7';
COMMENT ON COLUMN ${_prefix}sys_role.extend_s8 IS '扩展 String 8';
COMMENT ON COLUMN ${_prefix}sys_role.extend_i1 IS '扩展 Integer 1';
COMMENT ON COLUMN ${_prefix}sys_role.extend_i2 IS '扩展 Integer 2';
COMMENT ON COLUMN ${_prefix}sys_role.extend_i3 IS '扩展 Integer 3';
COMMENT ON COLUMN ${_prefix}sys_role.extend_i4 IS '扩展 Integer 4';
COMMENT ON COLUMN ${_prefix}sys_role.extend_f1 IS '扩展 Float 1';
COMMENT ON COLUMN ${_prefix}sys_role.extend_f2 IS '扩展 Float 2';
COMMENT ON COLUMN ${_prefix}sys_role.extend_f3 IS '扩展 Float 3';
COMMENT ON COLUMN ${_prefix}sys_role.extend_f4 IS '扩展 Float 4';
COMMENT ON COLUMN ${_prefix}sys_role.extend_d1 IS '扩展 Date 1';
COMMENT ON COLUMN ${_prefix}sys_role.extend_d2 IS '扩展 Date 2';
COMMENT ON COLUMN ${_prefix}sys_role.extend_d3 IS '扩展 Date 3';
COMMENT ON COLUMN ${_prefix}sys_role.extend_d4 IS '扩展 Date 4';

8
modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.8.sql Normal file
View File

@@ -0,0 +1,8 @@
-- 员工表新增工号字段
ALTER TABLE ${_prefix}sys_employee ADD emp_no varchar(100) NULL;
COMMENT ON COLUMN ${_prefix}sys_employee.emp_no IS '员工工号';
-- 新增 BPM 模块
INSERT INTO ${_prefix}sys_module(module_code, module_name, description, main_class_name, current_version, upgrade_info, status, create_by, create_date, update_by, update_date, remarks)
VALUES ('bpm', '业务流程', '流程设计器、流程监管控制、流程办理、流程追踪', 'com.jeesite.modules.bpm.entity.BpmEntity', '4.1.8', NULL, '0', 'system', now(), 'system', now(), NULL);

10
modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
View File

@@ -121,9 +121,11 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> ${text('员工编号')}：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('员工工号')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="employee.empCode" maxlength="32" readonly="${!empUser.isNewRecord}" class="form-control userName"/>
<#form:input path="employee.empNo" maxlength="32" class="form-control userName"
remote="${ctx}/sys/empUser/checkEmpNo?oldEmpNo=${empUser.employee.empNo}"
data-msg-remote="${text('员工工号已存在')}"/>
</div>
</div>
</div>
@@ -294,6 +296,10 @@ $("#inputForm").validate({
<% if(op == 'add' || op == 'auth') { // 获取选中角色 %>
$("#userRoleString").val(roleGrid.dataGrid('getSelectRows').join(','));
<% } %>
var empNo = $('#employee_empNo').val();
if (empNo == ''){
$('#employee_empNo').val($('#loginCode').val());
}
js.ajaxSubmitForm($(form), function(data){
js.showMessage(data.message);
if(data.result == Global.TRUE){