BUG对应

git-svn-id: https://192.168.57.71/svn/jsgkj@1232 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/UserCtl.java

@@ -111,6 +111,7 @@ public class UserCtl extends BaseCtl {
     public WebJsonResult save(UserVo vo) {
         // 新增
         if(StringUtils.isEmpty(vo.getId())) {
+            // 用户新增
             UserModel model = new UserModel();
             BeanUtils.copyProperties(vo, model);
             // 登录密码:123456
@@ -127,6 +128,8 @@ public class UserCtl extends BaseCtl {
                 model.setRylx(Constants.USER_TYPE_3);
             }
             userService.add(model);
+
+            // 用户信息新增
             UserInfoModel userInfoModel = new UserInfoModel();
             BeanUtils.copyProperties(vo, userInfoModel);
             userInfoModel.setId(model.getId());
@@ -141,13 +144,17 @@ public class UserCtl extends BaseCtl {
                 userInfoModel.setBelongsOrg(userInfoModel.getBelongsShip());
             }
             userInfoService.add(userInfoModel);
-            // TODO 改为多选
-            UserGroupModel userGroupModel = new UserGroupModel();
-            userGroupModel.setUserId(model.getId());
-            userGroupModel.setGroupId(vo.getGroupid());
-            userGroupService.add(userGroupModel);
+
+            // 用户分组新增
+            String[] groupids = vo.getGroupid().split(",");
+            for (String groupid : groupids) {
+                UserGroupModel userGroupModel = new UserGroupModel();
+                userGroupModel.setUserId(model.getId());
+                userGroupModel.setGroupId(groupid);
+                userGroupService.add(userGroupModel);
+            }
         } else {
-            // 更新
+            // 用户更新
             UserModel model = userService.findById(vo.getId());
             BeanUtils.copyProperties(vo, model, new String[] { "loginPassword", "rylx" });
             // 非管理员变更用户类型
@@ -164,14 +171,21 @@ public class UserCtl extends BaseCtl {
                 }
             }
             userService.update(model);
+
+            // 用户信息更新
             UserInfoModel userInfoModel = new UserInfoModel();
             BeanUtils.copyProperties(vo, userInfoModel);
             userInfoService.update(userInfoModel);
-            // TODO 更新有BUG，改为多选
-            UserGroupModel userGroupModel = new UserGroupModel();
-            userGroupModel.setUserId(model.getId());
-            userGroupModel.setGroupId(vo.getGroupid());
-            userGroupService.update(userGroupModel);
+
+            // 用户分组更新
+            userGroupService.deleteByUserId(model.getId());
+            String[] groupids = vo.getGroupid().split(",");
+            for (String groupid : groupids) {
+                UserGroupModel userGroupModel = new UserGroupModel();
+                userGroupModel.setUserId(model.getId());
+                userGroupModel.setGroupId(groupid);
+                userGroupService.add(userGroupModel);
+            }
         }
         return success();
     }
@@ -182,11 +196,15 @@ public class UserCtl extends BaseCtl {
     public UserVo getRecord(String id) {
 
         UserModel model = userInfoService.findById(id);
-        List<UserGroupModel> userGroupModel = userGroupService.findByUserId(id);
+        List<UserGroupModel> userGroupModels = userGroupService.findByUserId(id);
         UserVo vo = new UserVo();
         BeanUtils.copyProperties(model, vo);
-        if (userGroupModel != null && userGroupModel.size() > 0) {
-            vo.setGroupid(userGroupModel.get(0).getGroupId());
+        if (userGroupModels != null && userGroupModels.size() > 0) {
+            String groupids = "";
+            for (UserGroupModel userGroupModel : userGroupModels) {
+                groupids += userGroupModel.getGroupId() + ",";
+            }
+            vo.setGroupid(groupids);
         }
         return vo;
     }
@@ -203,7 +221,7 @@ public class UserCtl extends BaseCtl {
 				if(StringUtils.isNotEmpty(id)) {
 					cnt += userService.deleteLogicByID(id);
 					userInfoService.deleteLogicByID(id);
-					userGroupService.deleteLogicByID(id);
+					userGroupService.deleteByUserId(id);
 				}
 			}
 		}

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/user/main.jsp

@@ -97,7 +97,7 @@
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label" for="groupid">ËůĘôˇÖ×é</label>
                                     <div class="col-sm-4">
-                                        <select class="selectpicker form-control" id="groupid" name="groupid" title="ÇëŃĄÔń..."></select>
+                                        <select class="selectpicker form-control" multiple id="groupid" name="groupid" title="ÇëŃĄÔń..."></select>
                                     </div>
                                 </div>
                                 <div class="form-group">

gkaqv2/trunk/modules/web/src/main/webapp/static/js/common/common.js

@@ -371,6 +371,15 @@ $.formatString = function (str) {
     return str;
 };
 
+function multFmtData(data) {
+    var datas = data.split(',');
+    var fmtData = new Array();
+    for (var i = 0; i < datas.length; i++) {
+        if (!isNull(datas[i])) fmtData.push(datas[i]);
+    }
+    return fmtData;
+}
+
 if (typeof constData == "undefined") {
     var constData = {};
     // 人员类型
@@ -386,14 +395,4 @@ if (typeof constData == "undefined") {
     constData.orgType_4 = "站所";
     constData.orgType_8 = "企业";
     constData.orgType_9 = "科室";
-    
-//    $.ajax({
-//        type : "post",
-//        url : basePath + '/dict/findDicts?pcode=ORG_TYPE',
-//        success : function(data) {
-//            $.each(data, function() {
-//                eval('constData.orgType_' + data.optVal + '="' + data.optName + '"');
-//            });
-//        }
-//    });
 }

gkaqv2/trunk/modules/web/src/main/webapp/static/js/user/index.js

@@ -264,7 +264,7 @@ function editInfo() {
                 $("#loginName").prop('readonly', 'readonly');
                 $("#orgid").selectpicker('val', data.orgid);
                 changeSzd();
-                $("#groupid").selectpicker('val', data.groupid);
+                $("#groupid").selectpicker('val', multFmtData(data.groupid));
                 $("#ifSaftey").val(data.ifSaftey);
                 $("#ifLogin").val(data.ifLogin);
                 $("#ifMapview").val(data.ifMapview);
@@ -275,8 +275,7 @@ function editInfo() {
                 $("#ifJob").val(data.ifJob);
                 $("#belongsOrg").val(data.belongsOrg);
                 $("#belongsShip").val(data.belongsShip);
-                // TODO $('.selectpicker').selectpicker('val', ['Mustard','Relish']);
-                $('#approveSet').selectpicker('val', data.approveSet);
+                $('#approveSet').selectpicker('val', multFmtData(data.approveSet));
                 $("#declarerCid").val(data.declarerCid);
                 $("#belongsOperator").val(data.belongsOperator);
                 $("#safetyAssessOrg").val(data.safetyAssessOrg);