From b58a746ab3b7c49a56c60612e7abfbbbece792ed Mon Sep 17 00:00:00 2001
From: lai_kd <lai_kd@123>
Date: Tue, 3 Sep 2019 18:31:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A9=BF=E9=94=81=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 console-web/src/utils/index.js                |   9 ++
 console-web/src/views/modules/pub/role.vue    |  14 +-
 .../views/modules/pub/user-add-or-update.vue  |   1 +
 console-web/src/views/modules/pub/user.vue    | 140 ++++++++++++++++--
 .../action/buipubbpc1/BuiMenuNavAction.java   |  17 +--
 .../buipubbpc1/BuiOperOrRoleUpdataAction.java |  76 ++++++++++
 .../buipubbpc1/BuiOperQueryAllRoleAction.java |  76 ++++++++++
 .../mbu/web/pub/dal/dao/BuiOperMapper.java    |   2 +
 .../mbu/web/pub/dal/dao/BuiRoleMapper.java    |   6 +
 .../mbu/web/pub/dal/entity/BuiOperDO.java     |  62 ++++----
 .../pub/model/BuiOpenOrRoleUpdataReqBo.java   |  21 +++
 .../app/mbu/etc/pub/mapper/BuiRoleMapper.xml  |  12 +-
 .../webapp/WEB-INF/conf/action_config.xml     |   6 +
 13 files changed, 389 insertions(+), 53 deletions(-)
 create mode 100644 ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiOperOrRoleUpdataAction.java
 create mode 100644 ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiOperQueryAllRoleAction.java
 create mode 100644 ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiOpenOrRoleUpdataReqBo.java

diff --git a/console-web/src/utils/index.js b/console-web/src/utils/index.js
index d671ebe2..cdae3256 100644
--- a/console-web/src/utils/index.js
+++ b/console-web/src/utils/index.js
@@ -64,6 +64,15 @@ export function dataListToArray (data, id) {
   return res
 }
 
+export function dataListToArrayName (data, name) {
+  var res = []
+  for (var k = 0; k < data.length; k++) {
+    res.push(data[k][name])
+  }
+  // console.log('res:' + JSON.stringify(res))
+  return res
+}
+
 /**
  * 清除登录信息
  */
diff --git a/console-web/src/views/modules/pub/role.vue b/console-web/src/views/modules/pub/role.vue
index 74b49e3d..2a96cb5c 100644
--- a/console-web/src/views/modules/pub/role.vue
+++ b/console-web/src/views/modules/pub/role.vue
@@ -74,6 +74,7 @@
     </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <br/>
   </div>
 </template>
 
@@ -84,8 +85,10 @@
   export default {
     data () {
       return {
+        value1: [1, 4],
         dataForm: {
-          roleName: ''
+          roleName: '',
+          roleIdList: []
         },
         dataList: [],
         pageIndex: 1,
@@ -234,7 +237,16 @@
             this.$message.error(data.msg)
           }
         })
+      },
+      handleChange(value, direction, movedKeys) {
+        console.log(value, direction, movedKeys)
+        // 可以通过direction回调right/left 来进行操作，right：把数字移到右边，left把数据移到左边
+        if (direction === 'right') {
+        }
+        if (direction === 'left') {
+        }
       }
+
     }
   }
 </script>
diff --git a/console-web/src/views/modules/pub/user-add-or-update.vue b/console-web/src/views/modules/pub/user-add-or-update.vue
index ca8b2a1a..7136aef3 100644
--- a/console-web/src/views/modules/pub/user-add-or-update.vue
+++ b/console-web/src/views/modules/pub/user-add-or-update.vue
@@ -222,6 +222,7 @@
       },
       // 表单提交
       dataFormSubmit () {
+        console.log([].concat(this.dataForm.roleIdList).join(',')+"-------menulist------");
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.$http({
diff --git a/console-web/src/views/modules/pub/user.vue b/console-web/src/views/modules/pub/user.vue
index f58b1512..3a65e94d 100644
--- a/console-web/src/views/modules/pub/user.vue
+++ b/console-web/src/views/modules/pub/user.vue
@@ -1,3 +1,4 @@
+<!--suppress ALL -->
 <template>
   <div class="mod-user">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
@@ -16,7 +17,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       style="width: 100%;"
-      height="400">
+      height="350">
       <el-table-column
         fixed
         type="selection"
@@ -29,7 +30,8 @@
         header-align="center"
         align="center"
         width="80"
-        label="用户编号">
+        label="用户编号"
+      >
       </el-table-column>
       <el-table-column
         prop="oper_nm"
@@ -85,11 +87,12 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="200"
+        width="240"
         label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="queryHandle(scope.row.oper_id)">查看</el-button>
-          <el-button v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.oper_id)">修改</el-button>
+          <el-button type="text" size="small" @click="transferRole(scope.row.oper_id)">角色</el-button>
+          <el-button v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.oper_id,scope.row.oper_no)">修改</el-button>
           <el-button v-if="isAuth('sys:user:update')" type="text" size="small" @click="updatePasswordHandle(scope.row)">改密</el-button>
           <el-button v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row)">删除</el-button>
         </template>
@@ -108,21 +111,56 @@
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     <!-- 用户密码修改 -->
     <user-pwd-chg ref="userPwdChg"></user-pwd-chg>
+
+    <div>
+      <!--model 已拥有角色  data为为拥有角色
+       :props="{key: '',label: ''}"
+      -->
+    <el-transfer
+       v-model="dataForm.rightData"
+      :titles="['所有角色', '已拥有角色']"
+      :data="dataForm.leftData"
+      @change="handleChange"
+
+    >
+      <el-button class="transfer-footer" slot="right-footer" size="small" @click="savaRoles">保存</el-button>
+    </el-transfer>
+
+    </div>
   </div>
 </template>
 
 <script>
   import AddOrUpdate from './user-add-or-update'
-  import { isGDASucc } from '@/utils'
+  import { isGDASucc , dataListToArray,dataListToArrayName, treeDataTranslate} from '@/utils'
   import UserPwdChg from './user-pwd-chg'
 
   export default {
     data () {
       return {
+        roleid:0,
         dataForm: {
-          operNm: ''
+          pwdDate: 356,
+          password: '',
+          comfirmPassword: '',
+          type: '',
+          email: '',
+          mblNo: '',
+          roleIdList: [],
+          status: '0',
+          orgNoList: [],
+          operTypeList: [],
+          id: 0,
+          operNo: '',
+          operName: ' ',
+          leftData: [{key:1,lable:'测试1'},{key:2,lable:'测试2'},{key:3,lable:'测试3'}],
+          rightData: [1,3],
+          roleName: '',
+          remark: '' // this.dataForm.remark
         },
+        roleIdList: [],
         dataList: [],
+        rolesList:[],
         pageIndex: 1,
         pageSize: 10,
         totalPage: 0,
@@ -137,11 +175,12 @@
     },
     activated () {
       this.getDataList()
+      this.getTransfer()
     },
     methods: {
       // 数据转义
       // 获取数据列表
-      getDataList () {
+      getDataList: function () {
         this.dataListLoading = true
         var operNm = this.dataForm.operNm
         this.$http({
@@ -155,6 +194,8 @@
         }).then(({data}) => {
           if (isGDASucc(data)) {
             this.dataList = data.data
+            // this.leftData = data.data
+            // this.rightDate = data.data
             this.totalPage = data.totalCount
           } else {
             this.dataList = []
@@ -163,6 +204,80 @@
           this.dataListLoading = false
         })
       },
+      //  页面加载全部角色
+      getTransfer:function () {
+        this.dataListLoading = true
+        var operNm = this.dataForm.operNm
+        this.$http({
+          url: this.$http.adornUrl(`/buipubbpc1/buiOperQueryAllRole.do`),
+          method: 'post',
+          params: this.$http.adornParams({
+            'oper_nm': operNm
+          })
+        }).then(({data}) => {
+          if (isGDASucc(data)){
+            const datas=[]
+            for (let k in data.data.role_id_list) {
+              datas.push({
+                key: data.data.role_id_list[k]['id'],
+                label: data.data.role_id_list[k]['name'],
+              });
+            }
+            this.dataForm.leftData=datas
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 查询用户已有角色
+      transferRole: function (id,no) {
+        this.roleid=id;
+        this.dataForm.operNo=no
+        this.dataListLoading = true
+        let const_this=this
+        var operNm = this.dataForm.operNm
+        this.$http({
+          url: this.$http.adornUrl(`/buipubbpc1/buiOperQueryRole.do?oper_id=${id}`),
+          method: 'post',
+          params: this.$http.adornParams({
+            'oper_nm': operNm
+          })
+        }).then(({data}) => {
+          if (isGDASucc(data)) {
+            const roles = []
+            for (let k in data.data.role_id_list) {
+              roles.push(data.data.role_id_list[k]['id'])
+            }
+            this.dataForm.rightData =roles
+          }
+          this.dataListLoading = false
+        })
+      },
+    // 修改角色
+      savaRoles:function(id){
+        this.dataForm.id=this.roleid
+        this.$http({
+          url: this.$http.adornUrl(`/buipubbpc1/buiOperOrRoleUpdate.do`),
+          method: 'post',
+          data: this.$http.adornData({
+            'oper_id': this.dataForm.id, // this.dataForm.id || undefined,
+            'role_list': [].concat(this.dataForm.rightData).join(',')
+          })
+        }).then(({data}) => {
+          if (isGDASucc(data)) {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refreshDataList')
+              }
+            })
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      },
       // 每页数
       sizeChangeHandle (val) {
         this.pageSize = val
@@ -203,7 +318,7 @@
         })
       },
       // 删除
-      deleteHandle (row) {
+      deleteHandle: function (row) {
         var userIds = row ? [row.oper_id] : this.dataListSelections.map(item => {
           return item.oper_id
         })
@@ -212,6 +327,7 @@
         var userIds3 = row ? [row.oper_no] : this.dataListSelections.map(item => {
           return item.oper_no
         })
+
         // var userIds4 = userIds3.join(',')
         this.$confirm(`确定对[${userIds3.join(',')}]进行[${row ? '删除' : '批量删除'}]操作?`, '提示', {
           confirmButtonText: '确定',
@@ -239,7 +355,13 @@
               this.$message.error(data.msg)
             }
           })
-        }).catch(() => {})
+        }).catch(() => {
+        })
+      },
+      unique(arr) { // 根据唯一标识no来对数组进行过滤
+        const res = new Map();  //定义常量 res,值为一个Map对象实例
+        //返回arr数组过滤后的结果，结果为一个数组   过滤条件是，如果res中没有某个键，就设置这个键的值为1
+        return arr.filter((arr) => !res.has(arr.key) && res.set(arr.key, 1))
       },
       formatDate (row, column) {
         if (!row.tm_smp || row.tm_smp === '') {
diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiMenuNavAction.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiMenuNavAction.java
index 163539a8..1aac7663 100644
--- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiMenuNavAction.java
+++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiMenuNavAction.java
@@ -1,5 +1,6 @@
 package com.murong.ecp.netpay.mbu.web.pub.action.buipubbpc1;
 
+import com.alibaba.fastjson.JSON;
 import com.murong.ecp.netpay.mbu.web.common.utils.BaseAction;
 import com.murong.ecp.netpay.mbu.web.common.utils.CommonMessageCode;
 import com.murong.ecp.netpay.mbu.web.common.utils.OperSession;
@@ -10,22 +11,21 @@ import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiMenuDO;
 import com.murong.ecp.netpay.mbu.web.pub.model.BuiMenuDTO;
 import com.murong.ecp.netpay.mbu.web.pub.model.BuiMenuNavRspBO;
 import com.murong.ecp.netpay.mbu.web.pub.model.BuiOperDTO;
+import com.yuangou.ecp.biz.transengine.sqlsession.YGPageEntity;
 import com.yuangou.ecp.bp.core.common.exception.YGException;
 import com.yuangou.ecp.bp.core.common.message.YGBizMessage;
 import com.yuangou.ecp.bp.core.common.message.YGBizMessageContext;
-import com.alibaba.fastjson.JSON;
-import com.murong.ecp.netpay.mbu.web.common.utils.*;
-import com.murong.ecp.netpay.mbu.web.common.utils.BaseAction;
-import com.murong.ecp.netpay.mbu.web.common.utils.CommonMessageCode;
-import com.murong.ecp.netpay.mbu.web.common.utils.OperSession;
-import com.murong.ecp.netpay.mbu.web.common.utils.ResultT;
 import com.yuangou.ecp.bp.core.common.yglog4j.Logger;
 import com.yuangou.ecp.bp.core.common.yglog4j.YGLogger;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 菜单管理管理服务
@@ -90,11 +90,10 @@ public class BuiMenuNavAction extends BaseAction {
 		rspBO.setPermissions(StringUtils.join(permissions, "|"));
 
 
-		BuiMenuNavRspBO rspBO = PUBUtils.menuProc(list1);
+//		BuiMenuNavRspBO rspBO = PUBUtils.menuProc(list1);
 //		rspBO.setPermissions(PUBUtils.getPermissions(list1));
 		ResultT resultT = new ResultT();
 		resultT.setMsgCod(CommonMessageCode.SUCC);
-
 		resultT.setData(rspBO);
 
 		return resultT;
@@ -103,7 +102,7 @@ public class BuiMenuNavAction extends BaseAction {
 	private boolean walkMenuTree(List<BuiMenuDTO> list, Set<Long> authMenuIdSet) {
 		boolean flag = false;
 
-		for( Iterator iter = list.iterator(); iter.hasNext(); ) {
+		for(Iterator iter = list.iterator(); iter.hasNext(); ) {
 			BuiMenuDTO menuDTO = (BuiMenuDTO)iter.next();
 			if( authMenuIdSet.contains(menuDTO.getMenuId())) {
 				menuDTO.setFlag("Y");
diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiOperOrRoleUpdataAction.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiOperOrRoleUpdataAction.java
new file mode 100644
index 00000000..f91ce31e
--- /dev/null
+++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiOperOrRoleUpdataAction.java
@@ -0,0 +1,76 @@
+package com.murong.ecp.netpay.mbu.web.pub.action.buipubbpc1;
+
+import com.alibaba.fastjson.JSONObject;
+import com.murong.ecp.netpay.mbu.web.common.utils.*;
+import com.murong.ecp.netpay.mbu.web.pub.dal.dao.BuiOperMapper;
+import com.murong.ecp.netpay.mbu.web.pub.dal.dao.BuiOperRoleMapper;
+import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiOperDO;
+import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiOperRoleDO;
+import com.murong.ecp.netpay.mbu.web.pub.model.BuiOpenOrRoleUpdataReqBo;
+import com.murong.ecp.netpay.mbu.web.pub.model.BuiOperDTO;
+import com.yuangou.ecp.bp.core.common.exception.YGException;
+import com.yuangou.ecp.bp.core.common.message.YGBizMessage;
+import com.yuangou.ecp.bp.core.common.message.YGBizMessageContext;
+import com.yuangou.ecp.bp.core.common.yglog4j.Logger;
+import com.yuangou.ecp.bp.core.common.yglog4j.YGLogger;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Kodak
+ * @version 1.0
+ * @create 2019/09/03/18:20
+ */
+@Service("buiOperOrRoleUpdate")
+@Slf4j
+public class BuiOperOrRoleUpdataAction extends BaseAction {
+	@Autowired
+	private BuiOperMapper buiOperMapper;
+
+	@Autowired
+	private BuiOperRoleMapper operRoleMapper;
+
+	/**
+	 * 更新单笔
+	 *
+	 * @param bizCtx 上下文
+	 * @param reqBO  请求对象
+	 * @return
+	 * @throws YGException
+	 */
+	public ResultT execute(YGBizMessageContext bizCtx, BuiOpenOrRoleUpdataReqBo reqBO) throws YGException {
+		YGBizMessage bizMsg = bizCtx.getCurrentMsg();
+		Logger msgLog = YGLogger.getLogger(bizMsg);
+		msgLog.info("update, reqBO=" + JSONObject.toJSON(reqBO));
+
+		ValidatorUtil.validateObject(reqBO);
+		BuiOperDO entity = new BuiOperDO();
+		BeanUtils.copyProperties(reqBO, entity);
+		BuiOperDTO operDTO = OperSession.getOperInf(bizMsg);
+
+		AuditUtil.updateAudit(entity, operDTO);
+		int retCode = buiOperMapper.updateByPrimaryKeySelective(entity);
+
+		ResultT resultT = new ResultT();
+		if (retCode <= 0) {
+			resultT.setMsgCod(CommonMessageCode.REC_NFND);
+			return resultT;
+		}
+
+		operRoleMapper.deleteByOperId(String.valueOf(reqBO.getOperId()));
+		String[] roleList = StringUtils.split(reqBO.getRoleList(), ",");
+		for (String roleValue : roleList) {
+			BuiOperRoleDO operRoleDO = new BuiOperRoleDO();
+			operRoleDO.setOperId(reqBO.getOperId());
+			operRoleDO.setRoleId(NumberUtils.toLong(roleValue));
+			AuditUtil.addAudit(operRoleDO, operDTO);
+			operRoleMapper.insertSelective(operRoleDO);
+		}
+		resultT.setMsgCod(CommonMessageCode.SUCC);
+		return resultT;
+	}
+}
diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiOperQueryAllRoleAction.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiOperQueryAllRoleAction.java
new file mode 100644
index 00000000..e6c8891c
--- /dev/null
+++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/action/buipubbpc1/BuiOperQueryAllRoleAction.java
@@ -0,0 +1,76 @@
+package com.murong.ecp.netpay.mbu.web.pub.action.buipubbpc1;
+
+import com.alibaba.fastjson.JSONObject;
+import com.murong.ecp.netpay.mbu.web.common.utils.BaseAction;
+import com.murong.ecp.netpay.mbu.web.common.utils.CommonMessageCode;
+import com.murong.ecp.netpay.mbu.web.common.utils.ResultT;
+import com.murong.ecp.netpay.mbu.web.common.utils.ValidatorUtil;
+import com.murong.ecp.netpay.mbu.web.pub.dal.dao.BuiOperMapper;
+import com.murong.ecp.netpay.mbu.web.pub.dal.dao.BuiRoleMapper;
+import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiOperDO;
+import com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiRoleDO;
+import com.murong.ecp.netpay.mbu.web.pub.model.BuiOperQueryReqBO;
+import com.murong.ecp.netpay.mbu.web.pub.model.BuiOperQueryRoleRspBO;
+import com.yuangou.ecp.bp.core.common.exception.YGException;
+import com.yuangou.ecp.bp.core.common.message.YGBizMessage;
+import com.yuangou.ecp.bp.core.common.message.YGBizMessageContext;
+import com.yuangou.ecp.bp.core.common.yglog4j.Logger;
+import com.yuangou.ecp.bp.core.common.yglog4j.YGLogger;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author Kodak
+ * @version 1.0
+ * @create 2019/09/02/13:00
+ */
+@Service("buiOperQueryAllRole")
+@Slf4j
+public class BuiOperQueryAllRoleAction extends BaseAction {
+	@Autowired
+	private BuiOperMapper buiOperMapper;
+	@Autowired
+	private BuiRoleMapper roleMapper;
+	/**
+	 * 查询单笔
+	 *
+	 * @param bizCtx 上下文
+	 * @param reqBO  请求对象
+	 * @return
+	 * @throws YGException
+	 */
+	public ResultT<BuiOperQueryRoleRspBO> execute(YGBizMessageContext bizCtx, BuiOperQueryReqBO reqBO) throws YGException {
+		YGBizMessage bizMsg = bizCtx.getCurrentMsg();
+		Logger msgLog = YGLogger.getLogger(bizMsg);
+		msgLog.info("queryRole, reqBO=" + JSONObject.toJSON(reqBO));
+		ResultT resultT = new ResultT();
+
+		ValidatorUtil.validateObject(reqBO);
+
+		BuiOperDO entity = new BuiOperDO();
+		BeanUtils.copyProperties(reqBO, entity);
+
+
+
+		List<BuiRoleDO> buiRoleDOList  = roleMapper.selectName();
+		System.out.println(buiRoleDOList.size()+"-------所有角色------");
+		if (entity == null) {
+			resultT.setMsgCod(CommonMessageCode.REC_NFND);
+			return resultT;
+		}
+
+		BuiOperQueryRoleRspBO rspBO = new BuiOperQueryRoleRspBO();
+		BeanUtils.copyProperties(entity, rspBO);
+		rspBO.setRoleIdList(buiRoleDOList);
+
+		resultT.setMsgCod(CommonMessageCode.SUCC);
+		resultT.setData(rspBO);
+
+
+		return resultT;
+	}
+}
diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiOperMapper.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiOperMapper.java
index edec29c5..9178c4d4 100644
--- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiOperMapper.java
+++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiOperMapper.java
@@ -50,4 +50,6 @@ public interface BuiOperMapper {
 	 */
 	List<BuiOperDO> selectByRoleId(Long roleId);
 
+
+
 }
diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiRoleMapper.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiRoleMapper.java
index f5fbb3bb..2019b41d 100644
--- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiRoleMapper.java
+++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/dao/BuiRoleMapper.java
@@ -36,4 +36,10 @@ public interface BuiRoleMapper {
 	List<BuiRoleDO> selectByOperId(Long operId);
 
 	BuiRoleDO selectByName(String name);
+
+	/**
+	 * 查询所有的角色
+	 * @return
+	 */
+	List<BuiRoleDO> selectName();
 }
diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/entity/BuiOperDO.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/entity/BuiOperDO.java
index 5f5b541c..9b311b87 100644
--- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/entity/BuiOperDO.java
+++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/dal/entity/BuiOperDO.java
@@ -143,7 +143,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setOperId(Long operId) {
-		this.operId = operId == null ? Long.valueOf(0) : operId;
+		this.operId = operId;
 	}
 
 	public String getOperNo() {
@@ -151,7 +151,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setOperNo(String operNo) {
-		this.operNo = operNo == null ? "" : operNo.trim();
+		this.operNo = operNo;
 	}
 
 	public String getOperNm() {
@@ -159,7 +159,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setOperNm(String operNm) {
-		this.operNm = operNm == null ? "" : operNm.trim();
+		this.operNm = operNm;
 	}
 
 	public String getOperPwd() {
@@ -167,7 +167,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setOperPwd(String operPwd) {
-		this.operPwd = operPwd == null ? "" : operPwd.trim();
+		this.operPwd = operPwd;
 	}
 
 	public String getOperEmail() {
@@ -175,7 +175,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setOperEmail(String operEmail) {
-		this.operEmail = operEmail == null ? "" : operEmail.trim();
+		this.operEmail = operEmail;
 	}
 
 	public String getOperTyp() {
@@ -183,7 +183,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setOperTyp(String operTyp) {
-		this.operTyp = operTyp == null ? "" : operTyp.trim();
+		this.operTyp = operTyp;
 	}
 
 	public String getAuthLvl() {
@@ -191,7 +191,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setAuthLvl(String authLvl) {
-		this.authLvl = authLvl == null ? "" : authLvl.trim();
+		this.authLvl = authLvl;
 	}
 
 	public String getMblNo() {
@@ -199,7 +199,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setMblNo(String mblNo) {
-		this.mblNo = mblNo == null ? "" : mblNo.trim();
+		this.mblNo = mblNo;
 	}
 
 	public String getTelNo() {
@@ -207,7 +207,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setTelNo(String telNo) {
-		this.telNo = telNo == null ? "" : telNo.trim();
+		this.telNo = telNo;
 	}
 
 	public String getPwdExpPeriod() {
@@ -215,7 +215,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setPwdExpPeriod(String pwdExpPeriod) {
-		this.pwdExpPeriod = pwdExpPeriod == null ? "" : pwdExpPeriod.trim();
+		this.pwdExpPeriod = pwdExpPeriod;
 	}
 
 	public String getPwdUpdDt() {
@@ -223,7 +223,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setPwdUpdDt(String pwdUpdDt) {
-		this.pwdUpdDt = pwdUpdDt == null ? "" : pwdUpdDt.trim();
+		this.pwdUpdDt = pwdUpdDt;
 	}
 
 	public String getValDt() {
@@ -231,7 +231,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setValDt(String valDt) {
-		this.valDt = valDt == null ? "" : valDt.trim();
+		this.valDt = valDt;
 	}
 
 	public String getExpDt() {
@@ -239,7 +239,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setExpDt(String expDt) {
-		this.expDt = expDt == null ? "" : expDt.trim();
+		this.expDt = expDt;
 	}
 
 	public String getSts() {
@@ -247,7 +247,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setSts(String sts) {
-		this.sts = sts == null ? "" : sts.trim();
+		this.sts = sts;
 	}
 
 	public String getLoginTm() {
@@ -255,7 +255,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setLoginTm(String loginTm) {
-		this.loginTm = loginTm == null ? "" : loginTm.trim();
+		this.loginTm = loginTm;
 	}
 
 	public String getLastLogTm() {
@@ -263,7 +263,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setLastLogTm(String lastLogTm) {
-		this.lastLogTm = lastLogTm == null ? "" : lastLogTm.trim();
+		this.lastLogTm = lastLogTm;
 	}
 
 	public Long getLoginTms() {
@@ -271,7 +271,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setLoginTms(Long loginTms) {
-		this.loginTms = loginTms == null ? Long.valueOf(0) : loginTms;
+		this.loginTms = loginTms;
 	}
 
 	public String getLogMod() {
@@ -279,7 +279,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setLogMod(String logMod) {
-		this.logMod = logMod == null ? "" : logMod.trim();
+		this.logMod = logMod;
 	}
 
 	public String getUsbKeyId() {
@@ -287,7 +287,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setUsbKeyId(String usbKeyId) {
-		this.usbKeyId = usbKeyId == null ? "" : usbKeyId.trim();
+		this.usbKeyId = usbKeyId;
 	}
 
 	public Long getPswFailCnt() {
@@ -295,7 +295,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setPswFailCnt(Long pswFailCnt) {
-		this.pswFailCnt = pswFailCnt == null ? Long.valueOf(0) : pswFailCnt;
+		this.pswFailCnt = pswFailCnt;
 	}
 
 	public String getImgPath() {
@@ -303,7 +303,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setImgPath(String imgPath) {
-		this.imgPath = imgPath == null ? "" : imgPath.trim();
+		this.imgPath = imgPath;
 	}
 
 	public String getPwdSalt() {
@@ -311,7 +311,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setPwdSalt(String pwdSalt) {
-		this.pwdSalt = pwdSalt == null ? "" : pwdSalt.trim();
+		this.pwdSalt = pwdSalt;
 	}
 
 	public Long getOrgId() {
@@ -319,15 +319,7 @@ public class BuiOperDO extends BaseDO {
 	}
 
 	public void setOrgId(Long orgId) {
-		this.orgId = orgId == null ? Long.valueOf(0) : orgId;
-	}
-
-	public String getReqId() {
-		return reqId;
-	}
-
-	public void setReqId(String reqId) {
-		this.reqId = reqId == null ? "" : reqId.trim();
+		this.orgId = orgId;
 	}
 
 	public String getOrgNm() {
@@ -338,6 +330,14 @@ public class BuiOperDO extends BaseDO {
 		this.orgNm = orgNm;
 	}
 
+	public String getReqId() {
+		return reqId;
+	}
+
+	public void setReqId(String reqId) {
+		this.reqId = reqId;
+	}
+
 	@Override
 	public void clean() {
 		super.clean();
diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiOpenOrRoleUpdataReqBo.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiOpenOrRoleUpdataReqBo.java
new file mode 100644
index 00000000..b9082f6e
--- /dev/null
+++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/pub/model/BuiOpenOrRoleUpdataReqBo.java
@@ -0,0 +1,21 @@
+package com.murong.ecp.netpay.mbu.web.pub.model;
+
+import com.murong.ecp.bp.common.dict.ECPDict;
+import lombok.Data;
+
+/**
+ * @author Kodak
+ * @version 1.0
+ * @create 2019/09/03/18:17
+ */
+@Data
+public class BuiOpenOrRoleUpdataReqBo {
+
+	@ECPDict(required = true, message = "operId值不合法")
+	private Long operId;
+
+	@ECPDict(required = true, message = "roleList值不合法")
+	private String roleList;
+
+
+}
diff --git a/ecp-mbu-web/src/main/resources/app/mbu/etc/pub/mapper/BuiRoleMapper.xml b/ecp-mbu-web/src/main/resources/app/mbu/etc/pub/mapper/BuiRoleMapper.xml
index 3e528717..38118443 100644
--- a/ecp-mbu-web/src/main/resources/app/mbu/etc/pub/mapper/BuiRoleMapper.xml
+++ b/ecp-mbu-web/src/main/resources/app/mbu/etc/pub/mapper/BuiRoleMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.murong.ecp.netpay.mbu.web.pub.dal.dao.BuiRoleMapper">
     <select id="selectByPrimaryKey" resultType="com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiRoleDO">
         select <include refid="base_column_list"/>
-        from T_BUI_ROLE where id = #{id} 
+        from T_BUI_ROLE where id = #{id}
     </select>
 
     <!-- ��ҳ��ѯid��׺����ΪPage -->
@@ -41,7 +41,7 @@
                 <if test="isNotNull(updOpr)">upd_opr=#{updOpr},</if>
                 <if test="isNotNull(reqId)">req_id=#{reqId},</if>
         </trim>
-        where id = #{id} 
+        where id = #{id}
     </update>
 
     <update id="updateByPrimaryKeySelective" parameterType="com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiRoleDO">
@@ -57,7 +57,7 @@
             <if test="isNotNull(updOpr)">upd_opr=#{updOpr},</if>
             <if test="isNotNull(reqId)">req_id=#{reqId},</if>
         </trim>
-        where id = #{id} 
+        where id = #{id}
     </update>
 
     <insert id="insert" parameterType="com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiRoleDO">
@@ -120,4 +120,10 @@
         from T_BUI_ROLE where name = #{name}
     </select>
 
+    <select id="selectName" resultType="com.murong.ecp.netpay.mbu.web.pub.dal.entity.BuiRoleDO">
+        select  <include refid="base_column_list"/>
+        from T_BUI_ROLE
+
+    </select>
+
 </mapper>
diff --git a/ecp-mbu-web/src/main/webapp/WEB-INF/conf/action_config.xml b/ecp-mbu-web/src/main/webapp/WEB-INF/conf/action_config.xml
index e9afc4bc..c66b93ac 100644
--- a/ecp-mbu-web/src/main/webapp/WEB-INF/conf/action_config.xml
+++ b/ecp-mbu-web/src/main/webapp/WEB-INF/conf/action_config.xml
@@ -33,6 +33,12 @@
 
         <action path="/buipubbpc1/buiOperQueryRole" svr_nam="buipubbpc1" txn_cod="buiOperQueryRole" check_session="true" desc="查询操作员权限">
         </action>
+        <!--穿梭框查询-->
+        <action path="/buipubbpc1/buiOperQueryAllRole" svr_nam="buipubbpc1" txn_cod="buiOperQueryAllRole" check_session="true" desc="查询操作员权限">
+        </action>
+        <!--穿梭框修改-->
+        <action path="/buipubbpc1/buiOperOrRoleUpdate" svr_nam="buipubbpc1" txn_cod="buiOperOrRoleUpdate" check_session="true" desc="修改操作员权限">
+        </action>
 
         <action path="/buipubbpc1/buiOperUpdatePassword" svr_nam="buipubbpc1" txn_cod="buiOperUpdatePassword" check_session="true" desc="修改密码">
         </action>