合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -98,7 +98,7 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "添加成员", notes = "用户成员列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名，menuArray[]：角色ID,remark:备注" )
     })
     @RequestMapping(value = "/user/addUser", method = RequestMethod.POST)
     public ResponseBean addUser(@RequestBody String parameter,HttpSession session){
@@ -109,7 +109,7 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "修改成员", notes = "修改成员")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名，menuArray[]：角色ID,remark:备注，id：修改id" )
     })
     @RequestMapping(value = "/user/upDate", method = RequestMethod.POST)
     public ResponseBean upDate(@RequestBody String parameter,HttpSession session){
@@ -120,7 +120,7 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "查看成员详情", notes = "查看成员详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value="id:查询的ID")
     })
     @RequestMapping(value = "/user/selectById", method = RequestMethod.POST)
     public ResponseBean selectById(@RequestBody String parameter,HttpSession session){
@@ -131,7 +131,7 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "修改当前状态", notes = "修改当前状态")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "status:传入当前状态(0:无效，1：有效),id:当前修改的ID")
     })
     @RequestMapping(value = "/user/upDateStatus", method = RequestMethod.POST)
     public ResponseBean upDateStatus(@RequestBody String parameter,HttpSession session){

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -112,7 +112,7 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "添加成员", notes = "用户成员列表")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名，menuArray[]：角色ID,remark:备注" )
 	})
 	@RequestMapping(value = "/user/addUser", method = RequestMethod.POST)
 	public ResponseBean addUser(@RequestBody String parameter,HttpSession session){
@@ -123,7 +123,7 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "修改成员", notes = "修改成员")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名，menuArray[]：角色ID,remark:备注，id：修改id" )
 	})
 	@RequestMapping(value = "/user/upDate", method = RequestMethod.POST)
 	public ResponseBean upDate(@RequestBody String parameter,HttpSession session){
@@ -134,7 +134,7 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "查看成员详情", notes = "查看成员详情")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value="id:当前id")
 	})
 	@RequestMapping(value = "/user/selectById", method = RequestMethod.POST)
 	public ResponseBean selectById(@RequestBody String parameter,HttpSession session){
@@ -145,7 +145,7 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "修改当前状态", notes = "修改当前状态")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value=("status:传入当前状态(0:无效，1：有效),id:当前修改的id"))
 	})
 	@RequestMapping(value = "/user/upDateStatus", method = RequestMethod.POST)
 	public ResponseBean upDateStatus(@RequestBody String parameter,HttpSession session){
@@ -155,13 +155,10 @@ public class UserController extends BaseController {
 	}
 
 	@ApiOperation(value = "查看所有角色", notes = "查看所有角色")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
-	})
 	@RequestMapping(value = "/user/userRole", method = RequestMethod.POST)
 	public ResponseBean userRole(@RequestBody String parameter,HttpSession session){
 		UserElement userElement = getUserElement(session);
-		ResponseBean  responseBean = userService.allUserRole(parameter,userElement.getId(),userElement.getCommunityId());
+		ResponseBean  responseBean = userService.allUserRole(userElement.getCommunityId());
 		return responseBean;
 	}
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IUserService.java

@@ -79,11 +79,9 @@ public interface IUserService extends IService<User> {
 
     /**
      * 获取所有角色
-     * @param parameter
-     * @param id
      * @param communityId
      * @return
      */
-    ResponseBean allUserRole(String parameter, Integer id, Integer communityId);
+    ResponseBean allUserRole(Integer communityId);
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserServiceImpl.java

@@ -278,7 +278,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         List<User> userLoginName= userMapper.selectList(queryWrapper);
         Integer ID= object.getInteger("id");
         for (User us:userLoginName) {
-            // 修改手机号码时排除自身,通过比如ID排除是不是修改的本身
+            // 修改手机号码时排除自身,通过比对ID排除是不是修改的本身
             if (null != us.getLoginName()&&loginName.equals(us.getLoginName()) && (ID).equals(us.getId())){
                 break;
             }
@@ -389,7 +389,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
 
     @Override
-    public ResponseBean allUserRole(String parameter, Integer id, Integer communityId) {
+    public ResponseBean allUserRole( Integer communityId) {
         ResponseBean response = new ResponseBean<>();
         List<TpSysRole> tpSysRole=tpSysRoleMapper.allUserRole(communityId);
         response.addSuccess(tpSysRole);

VUECODE/smart-property-manage/src/views/account/user/index.vue

@@ -28,7 +28,9 @@
         type="selection"
         width="55"/>
       <el-table-column prop="userName" label="姓名" align="center"/>
-      <el-table-column prop="roleName" label="角色权限" align="center"/>
+      <el-table-column prop="roleName" label="角色权限" align="center">
+        <template slot-scope="scope"><a :title="scope.row.roleName"><span style="color: #8B8378	">{{ scope.row.roleName.length>='15'?scope.row.roleName.substring(0,15)+'..':scope.row.roleName }}</span></a></template>
+      </el-table-column>
       <el-table-column prop="loginName" label="手机号" align="center"/>
       <el-table-column prop="remark" label="备注" align="center"/>
       <el-table-column prop="createNmae" label="创建人" align="center"/>
@@ -71,15 +73,16 @@ export default {
       total: 0, // 数据总数
       listData: [],
       deleteIds: [], // 选择的id集合
-      listLoading: true // 加载圈
+      listLoading: true, // 加载圈
+      title : '',
     }
   },
   mounted() {
     // 获取数据
     this.dataQuery()
     // 截取角色
-    if(this.listQuery.roleName.length>1){
-      this.listQuery.roleName = this.listQuery.roleName.slice(0,10)+'...';
+    if(this.listQuery.roleName.length>this.listQuery.pageNum){
+      this.listQuery.roleName = this.listQuery.roleName.slice(0,this.listQuery.pageNum)+'...';
     }
   },
   methods: {