Merge remote-tracking branch 'origin/V1' into V1

common/src/main/java/com/jpsoft/smart/modules/sys/dao/UserDAO.java

@@ -18,5 +18,5 @@ public interface UserDAO {
 	List<User> list();
 	List<User> search(Map<String,Object> searchParams,List<Sort> sortList);
 	User findByUserName(@Param("userName") String userName);
-    long hasRole(String userId, String roleName);
+    long hasRole(@Param("userId") String userId,@Param("roleName") String roleName);
 }

common/src/main/resources/mapper/sys/User.xml

@@ -108,7 +108,7 @@
             ${sort.name} ${sort.order}
         </foreach>
     </select>
-    <select id="hasRole" resultType="long">
+    <select id="hasRole" parameterType="string" resultType="long">
         select count(*) from sys_user_role ur,sys_role r
         where ur.role_id = r.id_
         and ur.user_id = #{userId} and r.name_=#{roleName}