Index: ssts-web/src/main/webapp/systemmanage/userExtView.js
===================================================================
diff -u -r14505 -r14537
--- ssts-web/src/main/webapp/systemmanage/userExtView.js	(.../userExtView.js)	(revision 14505)
+++ ssts-web/src/main/webapp/systemmanage/userExtView.js	(.../userExtView.js)	(revision 14537)
@@ -86,6 +86,8 @@
 function deleteUser(){
 	var ids = grid.getSelectedValues('user.id', ';');
 	var userName = ";" + grid.getSelectedValues('user.name', ';') + ";";
+	var lockStatus = ";" + grid.getSelectedValues('user.lockStatus', ';') + ";";
+	
 	if(ids == ""){  //（陈家儒改）.trim()
 		alert("请选择要删除的用户！");
 		return false;
@@ -94,6 +96,10 @@
 		alert("不能删除系统管理员帐号！");
 		return false;
 	}
+	if(lockStatus.indexOf(";是;") >= 0){  //（陈家儒改）
+		alert("不能删除被锁定的用户！");
+		return false;
+	}
 	showWaitMsg("删除用户");
 	UserTableManager.deleteUserByKeyIds(ids, function(){showSuccess();grid.dwrReload();});
 }
@@ -263,12 +269,13 @@
     
     //Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
     var columns = [
-        {header: "user.id", width: 50, hidden:true,sortable: true,resizable: true, menuDisabled: false, dataIndex: 'user.id'},
+        /*{header: "user.id", width: 50, hidden:true,sortable: true,resizable: true, menuDisabled: false, dataIndex: 'user.id'},*/
         {header: "姓名", width: 100, dataIndex: 'user.fullName', renderer : gotoPage, sortable: false, menuDisabled: true},
         {header: "登录名", width: 100, dataIndex: 'user.name', sortable: false, menuDisabled: true},
         {header: "所属科室", width: 200, dataIndex: 'user.orgUnitNames', sortable: false, menuDisabled: true, renderer : returnEmptyValueIfNull},
         {header : '条码',width: 150, dataIndex: 'user.barcode', sortable: false},
         {header : '数据来源',width: 100, dataIndex: 'user.source', sortable: false},  //陳家儒：
+        {header : '锁定',width: 100, dataIndex: 'user.lockStatus', sortable: false},  //陳家儒：
         {id:'operationDescription', header: "拥有角色", width: 150, dataIndex: 'user.roleNames', sortable: false, menuDisabled: true, renderer : returnEmptyValueIfNull},
         {header: "排序操作", width: 100, dataIndex: 'id', renderer : moveUpDown, hidden: true, sortable: false, menuDisabled: true},
         {header: "拼音码", width: 100, dataIndex: 'user.spelling',  hidden: true, sortable: false, menuDisabled: true},
@@ -284,6 +291,7 @@
         {name: 'user.name'},
         {name: 'user.orgUnitNames'},
         {name: 'user.source'},  //陳家儒：
+        {name: 'user.lockStatus'},
         {name: 'user.roleNames'}
     ];