diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
index 48a822b3..0509fa59 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
@@ -11,13 +11,12 @@ import com.foreverwin.modular.core.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**
  *
  * @author robert
- * @since 2021-06-16
+ * @since 2021-06-24
  */
 @RestController
 @RequestMapping("/Z-USER-RESOURCE")
@@ -34,7 +33,7 @@ public class UserResourceController {
     */
     @ResponseBody
     @GetMapping("/{id:.+}")
-    public R getZUserResourceById(@PathVariable String id) {
+    public R getUserResourceById(@PathVariable String id) {
         return R.ok( userResourceService.getById(id));
     }
 
@@ -45,7 +44,7 @@ public class UserResourceController {
      */
     @ResponseBody
     @GetMapping("")
-    public R getZUserResourceList(UserResource userResource){
+    public R getUserResourceList(UserResource userResource){
         List<UserResource> result;
         QueryWrapper<UserResource> queryWrapper = new QueryWrapper<>();
         queryWrapper.setEntity(userResource);
@@ -61,10 +60,10 @@ public class UserResourceController {
      */
     @ResponseBody
     @GetMapping("/page")
-    public R page(FrontPage<UserResource> frontPage, UserResource zUserResource){
+    public R page(FrontPage<UserResource> frontPage, UserResource userResource){
         IPage result;
         QueryWrapper<UserResource> queryWrapper = new QueryWrapper<>();
-        queryWrapper.setEntity(zUserResource);
+        queryWrapper.setEntity(userResource);
         if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
             //TODO modify global query
             queryWrapper.lambda().and(wrapper -> wrapper
@@ -72,11 +71,13 @@ public class UserResourceController {
                 .or().like(UserResource::getSite, frontPage.getGlobalQuery())
                 .or().like(UserResource::getResourceBo, frontPage.getGlobalQuery())
                 .or().like(UserResource::getResrce, frontPage.getGlobalQuery())
+                .or().like(UserResource::getResrceDescription, frontPage.getGlobalQuery())
                 .or().like(UserResource::getUserId, frontPage.getGlobalQuery())
+                .or().like(UserResource::getUserDescription, frontPage.getGlobalQuery())
                 .or().like(UserResource::getTemporaryUser, frontPage.getGlobalQuery())
                 .or().like(UserResource::getStatus, frontPage.getGlobalQuery())
-                .or().like(UserResource::getCreateUser, frontPage.getGlobalQuery())
-                .or().like(UserResource::getModifyUser, frontPage.getGlobalQuery())
+                .or().like(UserResource::getCreatedUser, frontPage.getGlobalQuery())
+                .or().like(UserResource::getModifiedUser, frontPage.getGlobalQuery())
     );
         }
         result = userResourceService.page(frontPage.getPagePlus(), queryWrapper);
@@ -85,22 +86,22 @@ public class UserResourceController {
 
     /**
      * 新增
-     * @param zUserResource  传递的实体
+     * @param userResource  传递的实体
      * @return  null 失败  实体成功
      */
     @PostMapping
-    public R save(@RequestBody UserResource zUserResource) {
-        return R.ok(userResourceService.save(zUserResource));
+    public R save(@RequestBody UserResource userResource) {
+        return R.ok(userResourceService.save(userResource));
     }
 
     /**
      * 修改
-     * @param zUserResource  传递的实体
+     * @param userResource  传递的实体
      * @return  null 失败  实体成功
      */
     @PutMapping
-    public R updateById(@RequestBody UserResource zUserResource) {
-        return R.ok(userResourceService.updateById(zUserResource));
+    public R updateById(@RequestBody UserResource userResource) {
+        return R.ok(userResourceService.updateById(userResource));
     }
 
     /**
@@ -125,14 +126,18 @@ public class UserResourceController {
         return R.ok(userResourceService.removeByIds(ids));
     }
 
+    /**
+     * 检索
+     * @return
+     */
+    @ResponseBody
     @GetMapping("/findAll")
-    public R findAll(String resource,String user){
-        return R.ok(userResourceService.findAll(resource,user));
+    public R findAll(UserResourceDto userResourceDto){
+        return R.ok(userResourceService.findAll(userResourceDto));
     }
 
     @PostMapping("saveAll")
     public R saveAll(@RequestBody List<UserResourceDto> userResourceList){
-        HashMap<String,Object> hashMap = new HashMap<String,Object>();
         userResourceService.saveAll(userResourceList);
         return R.ok();
     }
@@ -149,4 +154,5 @@ public class UserResourceController {
             return R.failed(e.getMessage());
         }
     }
+
 }
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/UserResourceDto.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/UserResourceDto.java
index 9e2a1f52..09ad5bed 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/UserResourceDto.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/UserResourceDto.java
@@ -8,9 +8,17 @@ import com.foreverwin.mesnac.dispatch.model.UserResource;
  * @Since 2021-06-17
  */
 public class UserResourceDto extends UserResource {
-    /**序号**/
+    /**
+     * 序号
+     */
     String seq;
 
+    /**
+     * 资源描述
+     * @return
+     */
+    String resrceDescription;
+
     public String getSeq() {
         return seq;
     }
@@ -18,4 +26,14 @@ public class UserResourceDto extends UserResource {
     public void setSeq(String seq) {
         this.seq = seq;
     }
+
+    @Override
+    public String getResrceDescription() {
+        return resrceDescription;
+    }
+
+    @Override
+    public void setResrceDescription(String resrceDescription) {
+        this.resrceDescription = resrceDescription;
+    }
 }
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
index aebd2763..ee9c60e5 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
@@ -1,8 +1,8 @@
 package com.foreverwin.mesnac.dispatch.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mesnac.meapi.model.NwaUser;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -11,11 +11,11 @@ import java.util.List;
 
 /**
  * <p>
- * 员工资源对应表 Mapper 接口
+ *  Mapper 接口
  * </p>
  *
- * @author Leon.L
- * @since 2021-06-10
+ * @author robert
+ * @since 2021-06-24
  */
 @Repository
 public interface UserResourceMapper extends BaseMapper<UserResource> {
@@ -24,5 +24,11 @@ public interface UserResourceMapper extends BaseMapper<UserResource> {
 
     List<UserResource> findEnableList(@Param("site") String site, @Param("resource") String resource, @Param("user") String user);
 
-    List<UserResourceDto> findAll(@Param("site") String site, @Param("resource") String resource, @Param("user") String user);
+    List<UserResourceDto> findAll(@Param("site") String site,
+                                  @Param("resource") String resource,
+                                  @Param("userId") String userId
+                                  );
+
+
+
 }
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/UserResource.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/UserResource.java
index aeba03f8..df6f7f50 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/UserResource.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/UserResource.java
@@ -1,22 +1,21 @@
 package com.foreverwin.mesnac.dispatch.model;
 
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
 
 /**
  * <p>
- * 员工资源对应表
+ * 
  * </p>
  *
- * @author Leon.L
- * @since 2021-06-10
+ * @author robert
+ * @since 2021-06-24
  */
 
 @TableName("Z_USER_RESOURCE")
@@ -36,17 +35,30 @@ public class UserResource extends Model<UserResource> {
    @TableField("SITE")
    private String site;
     /**
-     * 资源
+     * 资源BO
      */
    @TableField("RESOURCE_BO")
    private String resourceBo;
+    /**
+     * 资源
+     */
    @TableField("RESRCE")
    private String resrce;
+    /**
+     * 资源描述
+     */
+   @TableField("RESRCE_DESCRIPTION")
+   private String resrceDescription;
     /**
      * 员工编号
      */
    @TableField("USER_ID")
    private String userId;
+    /**
+     * 员工描述
+     */
+   @TableField("USER_DESCRIPTION")
+   private String userDescription;
     /**
      * 是否临时员工
      */
@@ -60,8 +72,8 @@ public class UserResource extends Model<UserResource> {
     /**
      * 创建人
      */
-   @TableField("CREATE_USER")
-   private String createUser;
+   @TableField("CREATED_USER")
+   private String createdUser;
     /**
      * 创建时间
      */
@@ -70,10 +82,10 @@ public class UserResource extends Model<UserResource> {
     /**
      * 修改人
      */
-   @TableField("MODIFY_USER")
-   private String modifyUser;
+   @TableField("MODIFIED_USER")
+   private String modifiedUser;
     /**
-     * 修改时间
+     * 修改日期
      */
    @TableField("MODIFIED_DATE_TIME")
    private LocalDateTime modifiedDateTime;
@@ -111,6 +123,14 @@ public class UserResource extends Model<UserResource> {
       this.resrce = resrce;
    }
 
+   public String getResrceDescription() {
+      return resrceDescription;
+   }
+
+   public void setResrceDescription(String resrceDescription) {
+      this.resrceDescription = resrceDescription;
+   }
+
    public String getUserId() {
       return userId;
    }
@@ -119,6 +139,14 @@ public class UserResource extends Model<UserResource> {
       this.userId = userId;
    }
 
+   public String getUserDescription() {
+      return userDescription;
+   }
+
+   public void setUserDescription(String userDescription) {
+      this.userDescription = userDescription;
+   }
+
    public String getTemporaryUser() {
       return temporaryUser;
    }
@@ -135,12 +163,12 @@ public class UserResource extends Model<UserResource> {
       this.status = status;
    }
 
-   public String getCreateUser() {
-      return createUser;
+   public String getCreatedUser() {
+      return createdUser;
    }
 
-   public void setCreateUser(String createUser) {
-      this.createUser = createUser;
+   public void setCreatedUser(String createdUser) {
+      this.createdUser = createdUser;
    }
 
    public LocalDateTime getCreatedDateTime() {
@@ -151,12 +179,12 @@ public class UserResource extends Model<UserResource> {
       this.createdDateTime = createdDateTime;
    }
 
-   public String getModifyUser() {
-      return modifyUser;
+   public String getModifiedUser() {
+      return modifiedUser;
    }
 
-   public void setModifyUser(String modifyUser) {
-      this.modifyUser = modifyUser;
+   public void setModifiedUser(String modifiedUser) {
+      this.modifiedUser = modifiedUser;
    }
 
    public LocalDateTime getModifiedDateTime() {
@@ -175,17 +203,21 @@ public static final String RESOURCE_BO = "RESOURCE_BO";
 
 public static final String RESRCE = "RESRCE";
 
+public static final String RESRCE_DESCRIPTION = "RESRCE_DESCRIPTION";
+
 public static final String USER_ID = "USER_ID";
 
+public static final String USER_DESCRIPTION = "USER_DESCRIPTION";
+
 public static final String TEMPORARY_USER = "TEMPORARY_USER";
 
 public static final String STATUS = "STATUS";
 
-public static final String CREATE_USER = "CREATE_USER";
+public static final String CREATED_USER = "CREATED_USER";
 
 public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
 
-public static final String MODIFY_USER = "MODIFY_USER";
+public static final String MODIFIED_USER = "MODIFIED_USER";
 
 public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
 
@@ -202,12 +234,14 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
          ", site = " + site +
          ", resourceBo = " + resourceBo +
          ", resrce = " + resrce +
+         ", resrceDescription = " + resrceDescription +
          ", userId = " + userId +
+         ", userDescription = " + userDescription +
          ", temporaryUser = " + temporaryUser +
          ", status = " + status +
-         ", createUser = " + createUser +
+         ", createdUser = " + createdUser +
          ", createdDateTime = " + createdDateTime +
-         ", modifyUser = " + modifyUser +
+         ", modifiedUser = " + modifiedUser +
          ", modifiedDateTime = " + modifiedDateTime +
          "}";
    }
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
index e83816f8..6bf9ed8a 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
@@ -1,27 +1,40 @@
 package com.foreverwin.mesnac.dispatch.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
 import com.foreverwin.mesnac.meapi.model.NwaUser;
+import com.foreverwin.modular.core.util.FrontPage;
 
 import java.util.List;
 
 /**
  * <p>
- * 员工资源对应表 服务类
+ *  服务类
  * </p>
  *
- * @author Leon.L
- * @since 2021-06-10
+ * @author robert
+ * @since 2021-06-24
  */
 public interface UserResourceService extends IService<UserResource> {
 
+    /**
+     *  分页查询
+     * @param frontPage
+     * @return
+     */
+    IPage<UserResource> selectPage(FrontPage<UserResource> frontPage, UserResource userResource);
+
+    List<UserResource> selectList(UserResource userResource);
+
     List<NwaUser> findEmployeeList(String site, String resource);
 
     List<UserResource> findEnableList(String site, String resource, String user);
 
-    List<UserResourceDto> findAll(String resource, String user);
+    List<UserResourceDto> findAll(UserResourceDto userResourceDto);
 
     void saveAll(List<UserResourceDto> userResourceDtoList);
+
+
 }
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
index 3593d1bf..4a3d897f 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
@@ -1,25 +1,25 @@
 package com.foreverwin.mesnac.dispatch.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.common.constant.Constants;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.util.ExcelUtils;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.dispatch.enums.DispatchStatusEnum;
+import com.foreverwin.mesnac.dispatch.mapper.SfcDispatchMapper;
+import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
 import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
+import com.foreverwin.mesnac.dispatch.service.SfcDispatchService;
 import com.foreverwin.mesnac.dispatch.service.UserResourceService;
 import com.foreverwin.mesnac.meapi.service.ResrceService;
 import com.foreverwin.mesnac.meapi.util.StringUtils;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.FrontPage;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
-import com.foreverwin.mesnac.dispatch.mapper.SfcDispatchMapper;
-import com.foreverwin.mesnac.dispatch.service.SfcDispatchService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
index e002c432..8c3ead93 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
@@ -1,5 +1,7 @@
 package com.foreverwin.mesnac.dispatch.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
@@ -7,7 +9,11 @@ import com.foreverwin.mesnac.dispatch.mapper.UserResourceMapper;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
 import com.foreverwin.mesnac.dispatch.service.UserResourceService;
 import com.foreverwin.mesnac.meapi.model.NwaUser;
+import com.foreverwin.mesnac.meapi.service.NwaUserService;
+import com.foreverwin.mesnac.meapi.service.ResrceService;
+import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.FrontPage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,14 +21,13 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-
 /**
  * <p>
- * 员工资源对应表 服务实现类
+ *  服务实现类
  * </p>
  *
- * @author Leon.L
- * @since 2021-06-10
+ * @author robert
+ * @since 2021-06-24
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -33,6 +38,26 @@ public class UserResourceServiceImpl extends ServiceImpl<UserResourceMapper, Use
     private UserResourceMapper userResourceMapper;
 
 
+    @Autowired
+    private ResrceService resrceService;
+
+    @Autowired
+    private NwaUserService nwaUserService;
+
+    @Override
+    public IPage<UserResource> selectPage(FrontPage<UserResource> frontPage, UserResource userResource) {
+        QueryWrapper<UserResource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(userResource);
+        return super.page(frontPage.getPagePlus(), queryWrapper);
+    }
+
+    @Override
+    public List<UserResource> selectList(UserResource userResource) {
+        QueryWrapper<UserResource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(userResource);
+        return super.list(queryWrapper);
+    }
+
     @Override
     public List<NwaUser> findEmployeeList(String site, String resource) {
         return userResourceMapper.findEmployeeList(site, resource);
@@ -44,34 +69,54 @@ public class UserResourceServiceImpl extends ServiceImpl<UserResourceMapper, Use
     }
 
     @Override
-    public List<UserResourceDto> findAll(String resource, String user) {
+    public List<UserResourceDto> findAll(UserResourceDto userResourceDto) {
         String site = CommonMethods.getSite();
-        return userResourceMapper.findAll(site, resource, user);
+        String resource = userResourceDto.getResrce();
+        String userId = userResourceDto.getUserId();
+        return userResourceMapper.findAll(site, resource, userId);
     }
 
     @Override
     public void saveAll(List<UserResourceDto> userResourceDtoList) {
         List<UserResource> userResourceList = new ArrayList<>();
         String site = CommonMethods.getSite();
-        for (UserResourceDto userResourceDto: userResourceDtoList) {
+        for (int i = 0; i < userResourceDtoList.size(); i++) {
+            UserResourceDto userResourceDto = userResourceDtoList.get(i);
             UserResource userResource = new UserResource();
             userResource.setSite(site);
             userResource.setResourceBo(HandleEnum.RESOURCE.getHandle(site, userResourceDto.getResrce()));
             userResource.setResrce(userResourceDto.getResrce());
+            userResource.setResrceDescription(userResourceDto.getResrceDescription());
+            if(resrceService.findByResrce(userResource.getResrce()) == null) {
+                throw BusinessException.build("第"+(i+1)+"行的资源不存在");
+            }
             userResource.setUserId(userResourceDto.getUserId());
             userResource.setTemporaryUser(userResourceDto.getTemporaryUser());
+            userResource.setUserDescription(userResourceDto.getUserDescription());
+            NwaUser userByUserName = nwaUserService.findUserByUserName(userResource.getUserId());
+            if("false".equals(userResource.getTemporaryUser()) &&
+                    userByUserName == null){
+                throw BusinessException.build("第"+(i+1)+"行的用户不存在，必须为临时用户");
+            }else if(userByUserName != null){
+                userByUserName.setFullName(userResource.getUserDescription());
+                nwaUserService.saveOrUpdate(userByUserName);
+            }
             userResource.setStatus(userResourceDto.getStatus());
-            userResource.setCreateUser(CommonMethods.getUser());
+            userResource.setCreatedUser(CommonMethods.getUser());
             userResource.setHandle("UserResourceBo:"+userResource.getSite()+","+
                     userResource.getResrce()+","+userResource.getUserId());
             if(userResourceMapper.selectById(userResource.getHandle()) == null){
                 userResource.setCreatedDateTime(LocalDateTime.now());
             }
-            userResource.setModifyUser(CommonMethods.getUser());
+            userResource.setModifiedUser(CommonMethods.getUser());
             userResource.setModifiedDateTime(LocalDateTime.now());
 
             userResourceList.add(userResource);
         }
+
         this.saveOrUpdateBatch(userResourceList);
     }
+
+
+
 }
\ No newline at end of file
diff --git a/dispatch/src/main/resources/mapper/UserResourceMapper.xml b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
index c7dd89cf..c4a8e3ca 100644
--- a/dispatch/src/main/resources/mapper/UserResourceMapper.xml
+++ b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
@@ -8,18 +8,26 @@
         <result column="SITE" property="site" />
         <result column="RESOURCE_BO" property="resourceBo" />
         <result column="RESRCE" property="resrce" />
+        <result column="RESRCE_DESCRIPTION" property="resrceDescription" />
         <result column="USER_ID" property="userId" />
+        <result column="USER_DESCRIPTION" property="userDescription" />
         <result column="TEMPORARY_USER" property="temporaryUser" />
         <result column="STATUS" property="status" />
-        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATED_USER" property="createdUser" />
         <result column="CREATED_DATE_TIME" property="createdDateTime" />
-        <result column="MODIFY_USER" property="modifyUser" />
+        <result column="MODIFIED_USER" property="modifiedUser" />
         <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
     </resultMap>
 
+    <resultMap id="UserResourceDto" type="com.foreverwin.mesnac.dispatch.dto.UserResourceDto" extends="BaseResultMap">
+        <result column="SEQ" property="seq"/>
+        <result column="RESOURCE_DESCRIPTION" property="resrceDescription"/>
+    </resultMap>
+
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        HANDLE, SITE, RESOURCE_BO, RESRCE, USER_ID, TEMPORARY_USER, STATUS, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME
+        HANDLE, SITE, RESOURCE_BO, RESRCE, RESRCE_DESCRIPTION, USER_ID, USER_DESCRIPTION, TEMPORARY_USER, STATUS, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
     </sql>
 
     <!-- BaseMapper标准查询/修改/删除 -->
@@ -57,12 +65,14 @@
             <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
             <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
             <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
+            <if test="ew.entity.resrceDescription!=null"> AND RESRCE_DESCRIPTION=#{ew.entity.resrceDescription}</if>
             <if test="ew.entity.userId!=null"> AND USER_ID=#{ew.entity.userId}</if>
+            <if test="ew.entity.userDescription!=null"> AND USER_DESCRIPTION=#{ew.entity.userDescription}</if>
             <if test="ew.entity.temporaryUser!=null"> AND TEMPORARY_USER=#{ew.entity.temporaryUser}</if>
             <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-            <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+            <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
             <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
-            <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+            <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
             <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
         </where>
     </select>
@@ -78,12 +88,14 @@
                 <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                 <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
                 <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
+                <if test="ew.entity.resrceDescription!=null"> AND RESRCE_DESCRIPTION=#{ew.entity.resrceDescription}</if>
                 <if test="ew.entity.userId!=null"> AND USER_ID=#{ew.entity.userId}</if>
+                <if test="ew.entity.userDescription!=null"> AND USER_DESCRIPTION=#{ew.entity.userDescription}</if>
                 <if test="ew.entity.temporaryUser!=null"> AND TEMPORARY_USER=#{ew.entity.temporaryUser}</if>
                 <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                 <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
-                <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
                 <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@@ -107,12 +119,14 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
+                    <if test="ew.entity.resrceDescription!=null"> AND RESRCE_DESCRIPTION=#{ew.entity.resrceDescription}</if>
                     <if test="ew.entity.userId!=null"> AND USER_ID=#{ew.entity.userId}</if>
+                    <if test="ew.entity.userDescription!=null"> AND USER_DESCRIPTION=#{ew.entity.userDescription}</if>
                     <if test="ew.entity.temporaryUser!=null"> AND TEMPORARY_USER=#{ew.entity.temporaryUser}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
-                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@@ -136,12 +150,14 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
+                    <if test="ew.entity.resrceDescription!=null"> AND RESRCE_DESCRIPTION=#{ew.entity.resrceDescription}</if>
                     <if test="ew.entity.userId!=null"> AND USER_ID=#{ew.entity.userId}</if>
+                    <if test="ew.entity.userDescription!=null"> AND USER_DESCRIPTION=#{ew.entity.userDescription}</if>
                     <if test="ew.entity.temporaryUser!=null"> AND TEMPORARY_USER=#{ew.entity.temporaryUser}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
-                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@@ -165,12 +181,14 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
+                    <if test="ew.entity.resrceDescription!=null"> AND RESRCE_DESCRIPTION=#{ew.entity.resrceDescription}</if>
                     <if test="ew.entity.userId!=null"> AND USER_ID=#{ew.entity.userId}</if>
+                    <if test="ew.entity.userDescription!=null"> AND USER_DESCRIPTION=#{ew.entity.userDescription}</if>
                     <if test="ew.entity.temporaryUser!=null"> AND TEMPORARY_USER=#{ew.entity.temporaryUser}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
-                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@@ -194,12 +212,14 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
+                    <if test="ew.entity.resrceDescription!=null"> AND RESRCE_DESCRIPTION=#{ew.entity.resrceDescription}</if>
                     <if test="ew.entity.userId!=null"> AND USER_ID=#{ew.entity.userId}</if>
+                    <if test="ew.entity.userDescription!=null"> AND USER_DESCRIPTION=#{ew.entity.userDescription}</if>
                     <if test="ew.entity.temporaryUser!=null"> AND TEMPORARY_USER=#{ew.entity.temporaryUser}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
-                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@@ -223,12 +243,14 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
+                    <if test="ew.entity.resrceDescription!=null"> AND RESRCE_DESCRIPTION=#{ew.entity.resrceDescription}</if>
                     <if test="ew.entity.userId!=null"> AND USER_ID=#{ew.entity.userId}</if>
+                    <if test="ew.entity.userDescription!=null"> AND USER_DESCRIPTION=#{ew.entity.userDescription}</if>
                     <if test="ew.entity.temporaryUser!=null"> AND TEMPORARY_USER=#{ew.entity.temporaryUser}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
-                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@@ -248,12 +270,14 @@
             <if test="site!=null">SITE,</if>
             <if test="resourceBo!=null">RESOURCE_BO,</if>
             <if test="resrce!=null">RESRCE,</if>
+            <if test="resrceDescription!=null">RESRCE_DESCRIPTION,</if>
             <if test="userId!=null">USER_ID,</if>
+            <if test="userDescription!=null">USER_DESCRIPTION,</if>
             <if test="temporaryUser!=null">TEMPORARY_USER,</if>
             <if test="status!=null">STATUS,</if>
-            <if test="createUser!=null">CREATE_USER,</if>
+            <if test="createdUser!=null">CREATED_USER,</if>
             <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
-            <if test="modifyUser!=null">MODIFY_USER,</if>
+            <if test="modifiedUser!=null">MODIFIED_USER,</if>
             <if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
         </trim> VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -261,12 +285,14 @@
             <if test="site!=null">#{site},</if>
             <if test="resourceBo!=null">#{resourceBo},</if>
             <if test="resrce!=null">#{resrce},</if>
+            <if test="resrceDescription!=null">#{resrceDescription},</if>
             <if test="userId!=null">#{userId},</if>
+            <if test="userDescription!=null">#{userDescription},</if>
             <if test="temporaryUser!=null">#{temporaryUser},</if>
             <if test="status!=null">#{status},</if>
-            <if test="createUser!=null">#{createUser},</if>
+            <if test="createdUser!=null">#{createdUser},</if>
             <if test="createdDateTime!=null">#{createdDateTime},</if>
-            <if test="modifyUser!=null">#{modifyUser},</if>
+            <if test="modifiedUser!=null">#{modifiedUser},</if>
             <if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
         </trim>
     </insert>
@@ -281,12 +307,14 @@
             #{site},
             #{resourceBo},
             #{resrce},
+            #{resrceDescription},
             #{userId},
+            #{userDescription},
             #{temporaryUser},
             #{status},
-            #{createUser},
+            #{createdUser},
             #{createdDateTime},
-            #{modifyUser},
+            #{modifiedUser},
             #{modifiedDateTime},
         </trim>
     </insert>
@@ -297,12 +325,14 @@
         <if test="et.site!=null">SITE=#{et.site},</if>
         <if test="et.resourceBo!=null">RESOURCE_BO=#{et.resourceBo},</if>
         <if test="et.resrce!=null">RESRCE=#{et.resrce},</if>
+        <if test="et.resrceDescription!=null">RESRCE_DESCRIPTION=#{et.resrceDescription},</if>
         <if test="et.userId!=null">USER_ID=#{et.userId},</if>
+        <if test="et.userDescription!=null">USER_DESCRIPTION=#{et.userDescription},</if>
         <if test="et.temporaryUser!=null">TEMPORARY_USER=#{et.temporaryUser},</if>
         <if test="et.status!=null">STATUS=#{et.status},</if>
-        <if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
+        <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
         <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
-        <if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
+        <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
         <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
         </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
     </update>
@@ -313,12 +343,14 @@
         SITE=#{et.site},
         RESOURCE_BO=#{et.resourceBo},
         RESRCE=#{et.resrce},
+        RESRCE_DESCRIPTION=#{et.resrceDescription},
         USER_ID=#{et.userId},
+        USER_DESCRIPTION=#{et.userDescription},
         TEMPORARY_USER=#{et.temporaryUser},
         STATUS=#{et.status},
-        CREATE_USER=#{et.createUser},
+        CREATED_USER=#{et.createdUser},
         CREATED_DATE_TIME=#{et.createdDateTime},
-        MODIFY_USER=#{et.modifyUser},
+        MODIFIED_USER=#{et.modifiedUser},
         MODIFIED_DATE_TIME=#{et.modifiedDateTime},
      </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
     </update>
@@ -329,12 +361,14 @@
         <if test="et.site!=null">SITE=#{et.site},</if>
         <if test="et.resourceBo!=null">RESOURCE_BO=#{et.resourceBo},</if>
         <if test="et.resrce!=null">RESRCE=#{et.resrce},</if>
+        <if test="et.resrceDescription!=null">RESRCE_DESCRIPTION=#{et.resrceDescription},</if>
         <if test="et.userId!=null">USER_ID=#{et.userId},</if>
+        <if test="et.userDescription!=null">USER_DESCRIPTION=#{et.userDescription},</if>
         <if test="et.temporaryUser!=null">TEMPORARY_USER=#{et.temporaryUser},</if>
         <if test="et.status!=null">STATUS=#{et.status},</if>
-        <if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
+        <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
         <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
-        <if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
+        <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
         <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
     </trim>
         <where>
@@ -344,12 +378,14 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
+                    <if test="ew.entity.resrceDescription!=null"> AND RESRCE_DESCRIPTION=#{ew.entity.resrceDescription}</if>
                     <if test="ew.entity.userId!=null"> AND USER_ID=#{ew.entity.userId}</if>
+                    <if test="ew.entity.userDescription!=null"> AND USER_DESCRIPTION=#{ew.entity.userDescription}</if>
                     <if test="ew.entity.temporaryUser!=null"> AND TEMPORARY_USER=#{ew.entity.temporaryUser}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
-                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@@ -390,12 +426,14 @@
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
                     <if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
+                    <if test="ew.entity.resrceDescription!=null"> AND RESRCE_DESCRIPTION=#{ew.entity.resrceDescription}</if>
                     <if test="ew.entity.userId!=null"> AND USER_ID=#{ew.entity.userId}</if>
+                    <if test="ew.entity.userDescription!=null"> AND USER_DESCRIPTION=#{ew.entity.userDescription}</if>
                     <if test="ew.entity.temporaryUser!=null"> AND TEMPORARY_USER=#{ew.entity.temporaryUser}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
                     <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
-                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@@ -416,6 +454,13 @@
     <!-- BaseMapper标准查询/修改/删除 -->
 
 
+    <select id="findEmployeeList" resultType="com.foreverwin.mesnac.meapi.model.NwaUser">
+        SELECT A.SITE, A.USER_ID USER_NAME, B.FIRST_NAME, B.LAST_NAME, B.FULL_NAME
+        FROM Z_USER_RESOURCE A
+                 LEFT JOIN Z_NWA_USER B ON A.SITE = B.SITE AND A.USER_ID = B.USER_NAME
+        WHERE A.SITE = #{site}  AND A.RESRCE = #{resource}
+    </select>
+
     <select id="findEnableList" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"></include>
         FROM Z_USER_RESOURCE
@@ -428,26 +473,20 @@
         </if>
     </select>
 
-    <select id="findEmployeeList" resultType="com.foreverwin.mesnac.meapi.model.NwaUser">
-        SELECT A.SITE, A.USER_ID USER_NAME, B.FIRST_NAME, B.LAST_NAME, B.FULL_NAME
-        FROM Z_USER_RESOURCE A
-        LEFT JOIN Z_NWA_USER B ON A.SITE = B.SITE AND A.USER_ID = B.USER_NAME
-        WHERE A.SITE = #{site}  AND A.RESRCE = #{resource}
-    </select>
-
-
-    <resultMap id="UserResourceDto" type="com.foreverwin.mesnac.dispatch.dto.UserResourceDto" extends="BaseResultMap">
-        <result column="SEQ" property="seq"/>
-    </resultMap>
     <select id="findAll" resultMap="UserResourceDto">
-        SELECT ROW_NUMBER() OVER(ORDER BY RESRCE ASC) SEQ,<include refid="Base_Column_List"></include>
-        FROM Z_USER_RESOURCE
-        WHERE SITE = #{site}
+        SELECT ROW_NUMBER() OVER(ORDER BY ZUR.RESRCE ASC) SEQ,ZUR.*,R.DESCRIPTION RESOURCE_DESCRIPTION
+        FROM Z_USER_RESOURCE ZUR
+        INNER JOIN RESRCE R ON ZUR.RESOURCE_BO = R.HANDLE
+        WHERE ZUR.SITE = #{site}
         <if test="resource != null and resource != ''">
-            AND RESRCE = #{resource}
+            AND (ZUR.RESRCE LIKE '%${resource}%'
+            OR R.DESCRIPTION LIKE '%${resource}%')
         </if>
-        <if test="user != null and user != ''">
-            AND USER_ID = #{user}
+        <if test="userId != null and userId != ''">
+            AND (ZUR.USER_ID LIKE '%${userId}%'
+            OR ZUR.USER_DESCRIPTION LIKE '%${userId}%')
         </if>
     </select>
+
+
 </mapper>
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java
index 71f99434..24c0c40e 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java
@@ -139,10 +139,6 @@ public class NwaUserController {
         return R.ok(nwaUserService.removeByIds(ids));
     }
 
-    @GetMapping("findUserById")
-    public R findUserById(String user){
-        return R.ok(nwaUserService.findUserByUserName(user));
-    }
 
     /**
      * 不分页查询
@@ -150,7 +146,7 @@ public class NwaUserController {
      * @return
      */
     @GetMapping("findAllUser")
-    public R findAllUser(String user){
-        return R.ok(nwaUserService.findAllUser(user));
+    public R findAllUser(){
+        return R.ok(nwaUserService.findAllUser());
     }
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
index aa566ebf..f5e70c66 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java
@@ -131,21 +131,14 @@ public class ResrceController {
     public R removeByIds(List<String> ids){
         return R.ok(resrceService.removeByIds(ids));
     }
-    /**
-     *
-     */
-    @GetMapping("findByResrce")
-    public R findByResrce(String resrce){
-        return R.ok(resrceService.findByResrce(resrce));
-    }
+
 
     /**
      * 不分页查询
-     * @param resrce
      * @return
      */
     @GetMapping("findAllResrce")
-    public R findAllResrce(String resrce){
-        return R.ok(resrceService.findAllResrce(resrce));
+    public R findAllResrce(){
+        return R.ok(resrceService.findAllResrce());
     }
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java
index b7ed83d8..2470864f 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java
@@ -19,5 +19,5 @@ import java.util.List;
 public interface NwaUserMapper extends BaseMapper<NwaUser> {
     NwaUser findUserByUserName(@Param("site")String site, @Param("user")String user);
 
-    List<NwaUser> findAllUser(@Param("site")String site, @Param("user")String user);;
+    List<NwaUser> findAllUser(@Param("site")String site);;
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
index 4faccb95..11f309c4 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
@@ -31,5 +31,5 @@ public interface ResrceMapper extends BaseMapper<Resrce> {
 
     Resrce findByResrce(@Param("site")String site,@Param("resrce")String resrce);
 
-    List<Resrce> findAllResrce(@Param("site")String site,@Param("resrce")String resrce);
+    List<Resrce> findAllResrce(@Param("site")String site);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java
index d3833a08..907ceb1b 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java
@@ -28,5 +28,5 @@ public interface NwaUserService extends IService<NwaUser> {
 
     NwaUser findUserByUserName(String id);
 
-    List<NwaUser> findAllUser(String user);
+    List<NwaUser> findAllUser();
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
index 8757672b..279c3786 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
@@ -46,5 +46,5 @@ public interface ResrceService extends IService<Resrce> {
 
     Resrce findByResrce(String resrce);
 
-    List<Resrce> findAllResrce(String resrce);
+    List<Resrce> findAllResrce();
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java
index 74e26379..ef6ebe88 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java
@@ -50,9 +50,9 @@ public class NwaUserServiceImpl extends ServiceImpl<NwaUserMapper, NwaUser> impl
     }
 
     @Override
-    public List<NwaUser> findAllUser(String user) {
+    public List<NwaUser> findAllUser() {
         String site = CommonMethods.getSite();
-        return nwaUserMapper.findAllUser(site,user);
+        return nwaUserMapper.findAllUser(site);
     }
 
 
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
index 3836a5e2..6c9f72c6 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
@@ -63,9 +63,9 @@ public class ResrceServiceImpl extends ServiceImpl<ResrceMapper, Resrce> impleme
     }
 
     @Override
-    public List<Resrce> findAllResrce(String resrce) {
+    public List<Resrce> findAllResrce() {
         String site = CommonMethods.getSite();
-        return resrceMapper.findAllResrce(site,resrce);
+        return resrceMapper.findAllResrce(site);
     }
 
 
diff --git a/meapi/src/main/resources/mapper/NwaUserMapper.xml b/meapi/src/main/resources/mapper/NwaUserMapper.xml
index 0d4d1e05..96b6e2fe 100644
--- a/meapi/src/main/resources/mapper/NwaUserMapper.xml
+++ b/meapi/src/main/resources/mapper/NwaUserMapper.xml
@@ -313,7 +313,7 @@
         </if>
     </select>
     <select id="findUserByUserName" resultType="com.foreverwin.mesnac.meapi.model.NwaUser">
-        SELECT USER_NAME
+        SELECT *
         FROM Z_NWA_USER
         WHERE SITE = #{site}
         <if test="user != null and user != ''">
@@ -324,9 +324,6 @@
         SELECT USER_NAME,FULL_NAME
         FROM Z_NWA_USER
         WHERE SITE = #{site}
-        <if test="user != null and user != ''">
-            AND USER_NAME like '%${user}%'
-        </if>
     </select>
 
     <insert id="insert" parameterType="com.foreverwin.mesnac.meapi.model.NwaUser">
diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml
index 63e74785..ac0d90b5 100644
--- a/meapi/src/main/resources/mapper/ResrceMapper.xml
+++ b/meapi/src/main/resources/mapper/ResrceMapper.xml
@@ -568,8 +568,5 @@
         SELECT  RESRCE,DESCRIPTION
         FROM RESRCE
         WHERE SITE = #{site}
-        <if test="resrce != null and resrce != ''">
-            AND RESRCE like '%${resrce}%'
-        </if>
     </select>
 </mapper>