优化用户信息查询 加入属性功能

wuxw

2019-12-29 6ea1055e8376197bb93ad019b1ced103198d79ff

优化用户信息查询 加入属性功能

 Api/src/main/java/com/java110/api/listener/owner/AppUserBindingOwnerListener.java

@@ -2,28 +2,22 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.listener.AbstractServiceApiDataFlowListener;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.core.smo.file.IFileInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerAppUserInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.file.FileDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.entity.center.AppService;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.*;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

 Api/src/main/java/com/java110/api/listener/user/ListUsersListener.java

@@ -4,19 +4,13 @@
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.org.IOrgInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.UserDto;
import com.java110.dto.org.OrgDto;
import com.java110.dto.user.UserDto;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.api.org.ApiOrgDataVo;
import com.java110.vo.api.org.ApiOrgVo;
import com.java110.vo.api.user.ApiUserDataVo;
import com.java110.vo.api.user.ApiUserVo;
import org.apache.catalina.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;

 Api/src/main/java/com/java110/api/listener/users/QueryStaffServiceListener.java

@@ -1,12 +1,9 @@
package com.java110.api.listener.users;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.listener.AbstractServiceApiDataFlowListener;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.UserDto;
import com.java110.dto.org.OrgDto;
import com.java110.dto.user.UserDto;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ServiceCodeConstant;
import com.java110.utils.exception.ListenerExecuteException;
@@ -15,11 +12,8 @@
import com.java110.utils.util.StringUtil;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.factory.DataFlowFactory;
import com.java110.entity.center.AppService;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.vo.api.org.ApiOrgDataVo;
import com.java110.vo.api.org.ApiOrgVo;
import com.java110.vo.api.staff.ApiStaffDataVo;
import com.java110.vo.api.staff.ApiStaffVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +21,6 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
 * 查询员工信息

 CommonService/src/main/java/com/java110/common/smo/impl/AdvertInnerServiceSMOImpl.java

@@ -6,14 +6,12 @@
import com.java110.core.smo.advert.IAdvertInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.advert.AdvertDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;

/**

 CommonService/src/main/java/com/java110/common/smo/impl/AdvertItemInnerServiceSMOImpl.java

@@ -6,14 +6,12 @@
import com.java110.core.smo.advert.IAdvertItemInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.advert.AdvertItemDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;

/**

 CommonService/src/main/java/com/java110/common/smo/impl/AuditUserInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.audit.IAuditUserInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.auditUser.AuditUserDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;

 CommunityService/src/main/java/com/java110/community/smo/impl/AppInnerServiceSMOImpl.java

@@ -7,12 +7,10 @@
import com.java110.core.smo.app.IAppInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.app.AppDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;

 CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java

@@ -7,7 +7,7 @@
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.FloorDto;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

 CommunityService/src/main/java/com/java110/community/smo/impl/NoticeInnerServiceSMOImpl.java

@@ -7,7 +7,7 @@
import com.java110.core.smo.notice.INoticeInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.notice.NoticeDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 CommunityService/src/main/java/com/java110/community/smo/impl/ParkingSpaceInnerServiceSMOImpl.java

@@ -8,7 +8,7 @@
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.ParkingSpaceDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

 CommunityService/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java

@@ -6,14 +6,12 @@
import com.java110.core.smo.repair.IRepairInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.repair.RepairDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;

/**

 CommunityService/src/main/java/com/java110/community/smo/impl/RepairUserInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.repair.IRepairUserInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;

 CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java

@@ -12,7 +12,7 @@
import com.java110.dto.PageDto;
import com.java110.dto.RoomAttrDto;
import com.java110.dto.RoomDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

 CommunityService/src/main/java/com/java110/community/smo/impl/UnitInnerServiceSMOImpl.java

@@ -9,15 +9,13 @@
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UnitDto;
import com.java110.dto.UserDto;
import com.java110.utils.util.StringUtil;
import com.java110.dto.user.UserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
 * @ClassName FloorInnerServiceSMOImpl

 CommunityService/src/main/java/com/java110/community/smo/impl/VisitInnerServiceSMOImpl.java

@@ -8,7 +8,7 @@
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.core.smo.visit.IVisitInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.visit.VisitDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 FeeService/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java

@@ -8,7 +8,7 @@
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.FeeDto;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

 HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/smo/impl/MachineInnerServiceSMOImpl.java

@@ -2,12 +2,10 @@


import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.core.smo.hardwareAdapation.IMachineInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.demo.DemoDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.hardwareAdapation.dao.IMachineServiceDao;

 HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/smo/impl/MachineRecordInnerServiceSMOImpl.java

@@ -5,7 +5,6 @@
import com.java110.core.smo.hardwareAdapation.IMachineRecordInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.hardwareAdapation.MachineRecordDto;
import com.java110.hardwareAdapation.dao.IMachineRecordServiceDao;
import com.java110.utils.util.BeanConvertUtil;
@@ -13,7 +12,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;

/**

 StoreService/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java

@@ -5,10 +5,8 @@
import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
import com.java110.core.smo.room.IRoomInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.FeeDto;
import com.java110.dto.PageDto;
import com.java110.dto.RoomDto;
import com.java110.dto.UserDto;
import com.java110.dto.complaint.ComplaintDto;
import com.java110.store.dao.IComplaintServiceDao;
import com.java110.utils.util.BeanConvertUtil;

 StoreService/src/main/java/com/java110/store/smo/impl/businesstype/CbusinesstypeInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.businesstype.ICbusinesstypeInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.businesstype.CbusinesstypeDto;
import com.java110.store.dao.ICbusinesstypeServiceDao;
import org.springframework.beans.factory.annotation.Autowired;

 StoreService/src/main/java/com/java110/store/smo/impl/demo/DemoInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.core.smo.demo.IDemoInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.demo.DemoDto;
import com.java110.store.dao.IDemoServiceDao;
import org.springframework.beans.factory.annotation.Autowired;

 UserService/src/main/java/com/java110/user/dao/impl/UserServiceDaoImpl.java

@@ -446,7 +446,7 @@
    @Override
    public List<Map> queryUserInfoAttrs(Map info) throws DAOException {
        Assert.notNull(info, "queryUserInfo 的参数不能为空");
        logger.debug("----【userServiceDaoImpl.updateUserAttrInstance】保存数据入参 : " + JSONObject.toJSONString(info));
        logger.debug("----【userServiceDaoImpl.queryUserInfoAttrs】查询用户属性 : " + JSONObject.toJSONString(info));
        List<Map> userAttrs = sqlSessionTemplate.selectList("userServiceDaoImpl.queryUserInfoAttrs", info);
        return userAttrs;
    }

 UserService/src/main/java/com/java110/user/smo/impl/OrgStaffRelInnerServiceSMOImpl.java

@@ -5,7 +5,6 @@
import com.java110.core.smo.org.IOrgStaffRelInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.org.OrgStaffRelDto;
import com.java110.user.dao.IOrgStaffRelServiceDao;
import com.java110.utils.util.BeanConvertUtil;
@@ -13,7 +12,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;

/**

 UserService/src/main/java/com/java110/user/smo/impl/OwnerCarInnerServiceSMOImpl.java

@@ -7,7 +7,7 @@
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.user.dao.IOwnerCarServiceDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java

@@ -11,7 +11,7 @@
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.user.dao.IOwnerServiceDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 UserService/src/main/java/com/java110/user/smo/impl/OwnerRoomRelInnerServiceSMOImpl.java

@@ -7,7 +7,7 @@
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.user.dao.IOwnerRoomRelServiceDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 UserService/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java

@@ -1,11 +1,11 @@
package com.java110.user.smo.impl;

import com.java110.dto.PageDto;
import com.java110.dto.org.OrgDto;
import com.java110.dto.user.UserAttrDto;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import com.java110.user.dao.IUserServiceDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -68,7 +68,6 @@
    }



    @Override
    public int getUserCount(@RequestBody UserDto userDto) {

@@ -87,10 +86,34 @@

        List<UserDto> staffs = BeanConvertUtil.covertBeanList(userServiceDaoImpl.getUsers(BeanConvertUtil.beanCovertMap(userDto)), UserDto.class);


        freshUserAttrs(staffs);
        return staffs;
    }

    private void freshUserAttrs(List<UserDto> userDtos) {

        Map param = null;
        for (UserDto userDto : userDtos) {
            param = new HashMap();
            param.put("userId",userDto.getUserId());
            List<UserAttrDto> userAttrDtos = BeanConvertUtil.covertBeanList(userServiceDaoImpl.queryUserInfoAttrs(param), UserAttrDto.class);
            if(userAttrDtos == null || userAttrDtos.size() == 0){
                continue;
            }
            userDto.setUserAttrs(userAttrDtos);
            for(UserAttrDto userAttrDto : userAttrDtos){
                //openId 单独出来处理
                if("100201911001".equals(userAttrDto.getSpecCd())){
                    userDto.setOpenId(userAttrDto.getValue());
                }
            }


        }


    }


    public IUserServiceDao getUserServiceDaoImpl() {
        return userServiceDaoImpl;

 WebService/src/main/resources/components/menuPackage/edit-menu/editMenu.js

@@ -1,101 +1,101 @@
(function(vc,vm){
(function (vc, vm) {

    vc.extends({
        data:{
            editMenuInfo:{
                mId:'',
name:'',
url:'',
seq:'',
isShow:'',
description:'',
        data: {
            editMenuInfo: {
                mId: '',
                name: '',
                url: '',
                seq: '',
                isShow: '',
                description: '',

            }
        },
         _initMethod:function(){
        _initMethod: function () {

         },
         _initEvent:function(){
             vc.on('editMenu','openEditMenuModal',function(_params){
        },
        _initEvent: function () {
            vc.on('editMenu', 'openEditMenuModal', function (_params) {
                vc.component.refreshEditMenuInfo();
                $('#editMenuModel').modal('show');
                vc.copyObject(_params, vc.component.editMenuInfo );
                vc.component.editMenuInfo.communityId = vc.getCurrentCommunity().communityId;
                vc.copyObject(_params, vc.component.editMenuInfo);

            });
        },
        methods:{
            editMenuValidate:function(){
                        return vc.validate.validate({
                            editMenuInfo:vc.component.editMenuInfo
                        },{
                            'editMenuInfo.name':[
{
                            limit:"required",
                            param:"",
                            errInfo:"菜单名称不能为空"
        methods: {
            editMenuValidate: function () {
                return vc.validate.validate({
                    editMenuInfo: vc.component.editMenuInfo
                }, {
                    'editMenuInfo.name': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "菜单名称不能为空"
                        },
 {
                            limit:"maxin",
                            param:"2,10",
                            errInfo:"菜单名称必须在2至10字符之间"
                        {
                            limit: "maxin",
                            param: "2,10",
                            errInfo: "菜单名称必须在2至10字符之间"
                        },
                    ],
'editMenuInfo.url':[
{
                            limit:"required",
                            param:"",
                            errInfo:"菜单地址不能为空"
                    'editMenuInfo.url': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "菜单地址不能为空"
                        },
 {
                            limit:"maxLength",
                            param:"200",
                            errInfo:"菜单地址不能超过200"
                        {
                            limit: "maxLength",
                            param: "200",
                            errInfo: "菜单地址不能超过200"
                        },
                    ],
'editMenuInfo.seq':[
{
                            limit:"required",
                            param:"",
                            errInfo:"序列不能为空"
                    'editMenuInfo.seq': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "序列不能为空"
                        },
 {
                            limit:"num",
                            param:"",
                            errInfo:"序列必须为整数"
                        {
                            limit: "num",
                            param: "",
                            errInfo: "序列必须为整数"
                        },
                    ],
'editMenuInfo.isShow':[
{
                            limit:"required",
                            param:"",
                            errInfo:"菜单显示不能为空"
                    'editMenuInfo.isShow': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "菜单显示不能为空"
                        },
 {
                            limit:"maxin",
                            param:"1,12",
                            errInfo:"菜单显示错误"
                        {
                            limit: "maxin",
                            param: "1,12",
                            errInfo: "菜单显示错误"
                        },
                    ],
'editMenuInfo.description':[
 {
                            limit:"maxLength",
                            param:"200",
                            errInfo:"备注内容不能超过200"
                    'editMenuInfo.description': [
                        {
                            limit: "maxLength",
                            param: "200",
                            errInfo: "备注内容不能超过200"
                        },
                    ],
'editMenuInfo.mId':[
{
                            limit:"required",
                            param:"",
                            errInfo:"菜单ID不能为空"
                    'editMenuInfo.mId': [
                        {
                            limit: "required",
                            param: "",
                            errInfo: "菜单ID不能为空"
                        }]

                        });
             },
            editMenu:function(){
                if(!vc.component.editMenuValidate()){
                });
            },
            editMenu: function () {
                if (!vc.component.editMenuValidate()) {
                    vc.message(vc.validate.errInfo);
                    return ;
                    return;
                }

                vc.http.post(
@@ -103,36 +103,36 @@
                    'update',
                    JSON.stringify(vc.component.editMenuInfo),
                    {
                        emulateJSON:true
                     },
                     function(json,res){
                        emulateJSON: true
                    },
                    function (json, res) {
                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
                        if(res.status == 200){
                        if (res.status == 200) {
                            //关闭model
                            $('#editMenuModel').modal('hide');
                             vc.emit('menuManage','listMenu',{});
                            return ;
                            vc.emit('menuManage', 'listMenu', {});
                            return;
                        }
                        vc.message(json);
                     },
                     function(errInfo,error){
                    },
                    function (errInfo, error) {
                        console.log('请求失败处理');

                        vc.message(errInfo);
                     });
                    });
            },
            refreshEditMenuInfo:function(){
                vc.component.editMenuInfo= {
                  mId:'',
name:'',
url:'',
seq:'',
isShow:'',
description:'',
            refreshEditMenuInfo: function () {
                vc.component.editMenuInfo = {
                    mId: '',
                    name: '',
                    url: '',
                    seq: '',
                    isShow: '',
                    description: '',

                }
            }
        }
    });

})(window.vc,window.vc.component);
})(window.vc, window.vc.component);

 WebService/src/main/resources/views/auditAppUserBindingOwnerFlow.html

@@ -5,7 +5,7 @@
      xmlns:vc="http://www.thymeleaf.org">
<head>
    <meta charset="UTF-8"/>
    <title>审核业主绑定|java110</title>
    <title>审核绑定业主|java110</title>
    <vc:create name="commonTop"></vc:create>
</head>
<body>

 java110-bean/src/main/java/com/java110/dto/user/UserAttrDto.java

New file
@@ -0,0 +1,51 @@
package com.java110.dto.user;

import java.io.Serializable;

public class UserAttrDto implements Serializable {
    private String attrId;
    private String userId;
    private String specCd;
    private String value;
    private String createTime;

    public String getAttrId() {
        return attrId;
    }

    public void setAttrId(String attrId) {
        this.attrId = attrId;
    }

    public String getUserId() {
        return userId;
    }

    public void setUserId(String userId) {
        this.userId = userId;
    }

    public String getSpecCd() {
        return specCd;
    }

    public void setSpecCd(String specCd) {
        this.specCd = specCd;
    }

    public String getValue() {
        return value;
    }

    public void setValue(String value) {
        this.value = value;
    }

    public String getCreateTime() {
        return createTime;
    }

    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
}

 java110-bean/src/main/java/com/java110/dto/user/UserDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/UserDto.java
@@ -1,6 +1,9 @@
package com.java110.dto;
package com.java110.dto.user;

import com.java110.dto.PageDto;

import java.io.Serializable;
import java.util.List;

/**
 * @ClassName UserDto
@@ -45,6 +48,8 @@
    private String staffName;

    private String openId;

    private List<UserAttrDto> userAttrs;



@@ -183,4 +188,12 @@
    public void setOpenId(String openId) {
        this.openId = openId;
    }

    public List<UserAttrDto> getUserAttrs() {
        return userAttrs;
    }

    public void setUserAttrs(List<UserAttrDto> userAttrs) {
        this.userAttrs = userAttrs;
    }
}

 java110-code-generator/src/main/resources/template/InnerServiceSMOImpl.txt

@@ -8,7 +8,7 @@
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.StoreDto;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

 java110-core/src/main/java/com/java110/core/smo/owner/IOwnerAppUserInnerServiceSMO.java

@@ -17,7 +17,7 @@
 * @Version 1.0
 * add by wuxw 2019/4/24
 **/
@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
@FeignClient(name = "user-service", configuration = {FeignConfiguration.class})
@RequestMapping("/ownerAppUserApi")
public interface IOwnerAppUserInnerServiceSMO {


 java110-core/src/main/java/com/java110/core/smo/user/IUserInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.core.smo.user;

import com.java110.core.feign.FeignConfiguration;
import com.java110.dto.UserDto;
import com.java110.dto.user.UserDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml

@@ -283,7 +283,8 @@

    <!-- 查询用户属性信息 -->
    <select id="queryUserInfoAttrs" parameterType="map" resultType="map">
        select u.attr_id,u.user_id,u.spec_cd,u.value,u.b_id
        select u.attr_id,u.user_id,u.spec_cd,u.value,u.b_id,
        u.attr_id attrId,u.user_id userId,u.spec_cd specCd,u.b_id bId
        from u_user_attr u where u.status_cd = '0'
        <if test="bId != null and bId !=''">
            and u.b_id = #{bId}