xiao547607 3 år sedan
förälder
incheckning
f9fa2f000f

+ 1 - 1
common/src/main/java/com/jpsoft/employment/modules/sys/dao/UserDAO.java

@@ -24,5 +24,5 @@ public interface UserDAO {
 
     UserVO getUser(String id);
 
-	List<User> findByRoleAndCompanyId(String roleName,String companyId);
+	List<User> findByRoleIdAndCompanyId(String roleName,String companyId);
 }

+ 1 - 1
common/src/main/java/com/jpsoft/employment/modules/sys/service/UserService.java

@@ -21,5 +21,5 @@ public interface UserService {
 	boolean hasRole(String userId, String roleName) ;
     User findByOpenId(String openId);
 	UserVO getUser(String id);
-	List<User> findByRoleAndCompanyId(String roleName,String companyId);
+	List<User> findByRoleIdAndCompanyId(String roleId,String companyId);
 }

+ 2 - 2
common/src/main/java/com/jpsoft/employment/modules/sys/service/impl/UserServiceImpl.java

@@ -92,7 +92,7 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public List<User> findByRoleAndCompanyId(String roleName,String companyId){
-		return userDAO.findByRoleAndCompanyId(roleName,companyId);
+	public List<User> findByRoleIdAndCompanyId(String roleId,String companyId){
+		return userDAO.findByRoleIdAndCompanyId(roleId,companyId);
 	}
 }

+ 1 - 1
common/src/main/resources/mapper/sys/User.xml

@@ -151,7 +151,7 @@
             where u.id_=#{0} and u.del_flag=0
             limit 1
     </select>
-    <select id="findByRoleAndCompanyId" resultMap="UserMap">
+    <select id="findByRoleIdAndCompanyId" resultMap="UserMap">
         SELECT
             *
         FROM

+ 1 - 1
web/src/main/java/com/jpsoft/employment/modules/mobile/controller/ResumeApiController.java

@@ -223,7 +223,7 @@ public class ResumeApiController {
                 mc.setType("1");
                 mc.setStatus(true);
                 mc.setIsNeedAgree(false);
-                List<User> hrUserList = userService.findByRoleAndCompanyId("40846865-15ec-4de4-983e-054eb47666a4",recruitment.getCompanyId());
+                List<User> hrUserList = userService.findByRoleIdAndCompanyId("40846865-15ec-4de4-983e-054eb47666a4",recruitment.getCompanyId());
                 if(hrUserList.size() > 0){
                     mc.setRecipientId(StringUtils.join(hrUserList.toArray(), ","));
                     messageNoticeService.insert(mc);