解决冲突bug

infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml

@@ -98,7 +98,7 @@
         </foreach>
     </update>
 
-    <select id="search" parameterType="com.electromagnetic.industry.software.data.manage.request.user.UserSearchRequest" resultType="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User">
+    <select id="search" parameterType="com.electromagnetic.industry.software.data.manage.request.user.SearchUserRequest" resultType="com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User">
         SELECT *
         FROM ed_users
         <where>

service/src/main/java/com/electromagnetic/industry/software/data/manage/service/facade/user/UserFacadeImpl.java

@@ -134,7 +134,9 @@ public class UserFacadeImpl implements UserFacade {
     @Override
     public ElectromagneticResult<UserSearchResponse> searchUser(SearchUserRequest searchUserRequest){
         List<User> userList = userService.searchUser(UserMappers.INSTANCE.getSearchKeywordsRequestToModel(searchUserRequest));
-        UserSearchResponse userSearchResponse =  UserMappers.INSTANCE.userListToResponse(userList);
+        List<SingleUserResponse> singleUserResponseList = UserMappers.INSTANCE.userListToResponseList(userList);
+        UserSearchResponse userSearchResponse =  new UserSearchResponse();
+        userSearchResponse.setUserList(singleUserResponseList);
         return ElectromagneticResultUtil.success(userSearchResponse);
     }
 

service/src/main/java/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappers.java

@@ -56,11 +56,11 @@ public interface UserMappers {
     SearchKeywords getSearchKeywordsRequestToModel(SearchUserRequest searchUserRequest);
 
     /**
-     * 获取单条用户信息Request转用户模型
+     * 获取用户列表转response列表
      * @param users
      * @return
      */
-    UserSearchResponse userListToResponse(List<User> users);
+    List<SingleUserResponse> userListToResponseList(List<User> users);
 
     /**
      * 编辑用户Request转用户模型

service/target/generated-sources/annotations/com/electromagnetic/industry/software/data/manage/service/mappers/UserMappersImpl.java

@@ -1,16 +1,21 @@
 package com.electromagnetic.industry.software.data.manage.service.mappers;
 
+import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.SearchKeywords;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.User;
 import com.electromagnetic.industry.software.data.manage.domain.boardservice.user.model.UserLoginInfo;
-import com.electromagnetic.industry.software.data.manage.request.user.GetSingleUserRequest;
+import com.electromagnetic.industry.software.data.manage.request.user.SearchUserRequest;
 import com.electromagnetic.industry.software.data.manage.request.user.UserLoginRequest;
+import com.electromagnetic.industry.software.data.manage.request.user.UserModiRequest;
 import com.electromagnetic.industry.software.data.manage.request.user.UserRequest;
+import com.electromagnetic.industry.software.data.manage.request.user.UserWorkNumRequest;
 import com.electromagnetic.industry.software.data.manage.response.user.SingleUserResponse;
+import java.util.ArrayList;
+import java.util.List;
 import javax.annotation.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-11-15T16:08:08+0800",
+    date = "2024-11-19T13:26:03+0800",
     comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_141 (Oracle Corporation)"
 )
 public class UserMappersImpl implements UserMappers {
@@ -52,20 +57,6 @@ public class UserMappersImpl implements UserMappers {
         return userLoginInfo;
     }
 
-    @Override
-    public User getSingleUserRequestToModel(GetSingleUserRequest getSingleUserRequest) {
-        if ( getSingleUserRequest == null ) {
-            return null;
-        }
-
-        User user = new User();
-
-        user.setUserId( getSingleUserRequest.getUserId() );
-        user.setUserName( getSingleUserRequest.getUserName() );
-
-        return user;
-    }
-
     @Override
     public SingleUserResponse getSingleUserToResponse(User user) {
         if ( user == null ) {
@@ -97,4 +88,67 @@ public class UserMappersImpl implements UserMappers {
 
         return singleUserResponse;
     }
+
+    @Override
+    public SearchKeywords getSearchKeywordsRequestToModel(SearchUserRequest searchUserRequest) {
+        if ( searchUserRequest == null ) {
+            return null;
+        }
+
+        SearchKeywords searchKeywords = new SearchKeywords();
+
+        return searchKeywords;
+    }
+
+    @Override
+    public List<SingleUserResponse> userListToResponseList(List<User> users) {
+        if ( users == null ) {
+            return null;
+        }
+
+        List<SingleUserResponse> list = new ArrayList<SingleUserResponse>( users.size() );
+        for ( User user : users ) {
+            list.add( getSingleUserToResponse( user ) );
+        }
+
+        return list;
+    }
+
+    @Override
+    public User getUserModiRequestToModel(UserModiRequest userModiRequest) {
+        if ( userModiRequest == null ) {
+            return null;
+        }
+
+        User user = new User();
+
+        user.setUserId( userModiRequest.getUserId() );
+        user.setUserName( userModiRequest.getUserName() );
+        user.setWorkNumber( userModiRequest.getWorkNumber() );
+        user.setMobile( userModiRequest.getMobile() );
+        user.setUserDept( userModiRequest.getUserDept() );
+        user.setUserTitle( userModiRequest.getUserTitle() );
+        user.setJoinTime( userModiRequest.getJoinTime() );
+        user.setUserStatus( userModiRequest.getUserStatus() );
+        user.setInternshipEndDate( userModiRequest.getInternshipEndDate() );
+        user.setModifier( userModiRequest.getModifier() );
+        user.setModifierName( userModiRequest.getModifierName() );
+
+        return user;
+    }
+
+    @Override
+    public User getUserWorkNumRequestToModel(UserWorkNumRequest userWorkNumRequest) {
+        if ( userWorkNumRequest == null ) {
+            return null;
+        }
+
+        User user = new User();
+
+        user.setUserId( userWorkNumRequest.getUserId() );
+        user.setUserName( userWorkNumRequest.getUserName() );
+        user.setWorkNumber( userWorkNumRequest.getWorkNumber() );
+
+        return user;
+    }
 }