代码提交

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

@@ -16,8 +16,6 @@ public interface UserDAO {
 	User get(String id);
 	int delete(String id);
 	List<User> list();
-	List<User> findByCompanyId(String companyId);
-	List<User> findByCompanyList(@Param("searchParams") Map<String, Object> searchParams, @Param("sortList") List<Sort> sortList);
 	List<User> search(Map<String, Object> searchParams, List<Sort> sortList);
 	User findByUserName(@Param("userName") String userName);
     long hasRole(@Param("userId") String userId, @Param("roleName") String roleName);

common/src/main/java/com/jpsoft/employment/modules/sys/entity/User.java

@@ -11,8 +11,6 @@ import java.util.List;
  */
 public class User {
 	private String id;
-	private String companyId;
-	private String companyName;
 	private String userName;
 	private String password;
 	private String realName;
@@ -155,28 +153,6 @@ public class User {
 		this.roles = roles;
 	}
 
-	/**
-	 *设置企业名称
-	 */
-	public String getCompanyId() {
-		return companyId;
-	}
-
-	public void setCompanyId(String companyId) {
-		this.companyId = companyId;
-	}
-
-	/**
-	 *设置企业名称
-	 */
-	public String getCompanyName() {
-		return companyName;
-	}
-
-	public void setCompanyName(String companyName) {
-		this.companyName = companyName;
-	}
-
 	public String getOpenId() {
 		return openId;
 	}

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

@@ -14,8 +14,6 @@ public interface UserService {
 	int update(User model);
 	int delete(String id);
 	List<User> list();
-	List<User> findByCompanyId(String companyId);
-	List<User> findByCompanyList(Map<String, Object> searchParams, List<Sort> sortList);
 	Page<User> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 	User findByUserName(String userName);
 	boolean hasRole(String userId, String roleName) ;

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

@@ -59,16 +59,6 @@ public class UserServiceImpl implements UserService {
 		return userDAO.list();
 	}
 
-	@Override
-	public List<User> findByCompanyId(String companyId){
-		return userDAO.findByCompanyId(companyId);
-	}
-
-	@Override
-	public List<User> findByCompanyList(Map<String,Object> searchParams,List<Sort> sortList){
-		return userDAO.findByCompanyList(searchParams,sortList);
-	}
-
 	@Override
 	public Page<User> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {
         Page<User> page = PageHelper.startPage(pageNumber,pageSize).doSelectPage(()->{

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

@@ -6,8 +6,6 @@
     <resultMap id="UserMap" type="com.jpsoft.employment.modules.sys.entity.User">
         <id property="id" column="id_"/>
         <result property="userName" column="user_name"/>
-        <result property="companyId" column="company_id" />
-        <result property="companyName" column="company_name" />
         <result property="password" column="password_"/>
         <result property="realName" column="real_name"/>
         <result property="createTime" column="create_time"/>
@@ -25,12 +23,11 @@
         -->
         <![CDATA[
 		insert into sys_user
-	    (id_,company_id,user_name,password_,real_name,create_time,update_time,
+	    (id_,user_name,password_,real_name,create_time,update_time,
 	    del_flag,create_by,update_by,open_id)
 		values
 		(
             #{id,jdbcType=VARCHAR}
-            ,#{companyId,jdbcType=VARCHAR}
             ,#{userName,jdbcType=VARCHAR}
             ,#{password,jdbcType=VARCHAR}
             ,#{realName,jdbcType=VARCHAR}
@@ -52,9 +49,6 @@
             <if test="userName!=null">
                 user_name=#{userName,jdbcType=VARCHAR},
             </if>
-            <if test="companyId!=null">
-                company_id=#{companyId,jdbcType=VARCHAR},
-            </if>
             <if test="password!=null">
                 password_=#{password,jdbcType=VARCHAR},
             </if>
@@ -91,29 +85,13 @@
     <select id="list" resultMap="UserMap">
         select * from sys_user
     </select>
-    <select id="findByCompanyId" parameterType="string" resultMap="UserMap">
-        select * from sys_user where company_id = #{0} and  del_flag = 0
-    </select>
-
-    <select id="findByCompanyList" resultMap="UserMap">
-        select * from sys_user
-        <where>
-            del_flag = 0
-            <if test="searchParams.companyList!=null">
-                <foreach collection="searchParams.companyList" index="index" item="item" open="and company_id in("
-                         separator="," close=")">
-                    #{item.id}
-                </foreach>
-            </if>
-        </where>
-    </select>
     <select id="findByUserName" parameterType="string" resultMap="UserMap">
         select * from sys_user where user_name=#{userName} and del_flag=0 limit 1
     </select>
     <select id="search" parameterType="hashmap" resultMap="UserMap">
         <![CDATA[
-			select a.*,b.company_name as company_name
-			from sys_user a LEFT JOIN base_company_info b ON a.company_id = b.id_
+			select a.*
+			from sys_user a
 			where a.del_flag = 0
 		]]>
         <if test="searchParams.userName != null">
@@ -122,9 +100,6 @@
         <if test="searchParams.realName != null">
             and a.real_name like #{searchParams.realName}
         </if>
-        <if test="searchParams.companyId != null">
-            and a.company_id = #{searchParams.companyId}
-        </if>
         <if test="searchParams.roleId != null">
             and a.id_ in (select c.user_id from sys_user_role c where c.role_id = #{searchParams.roleId})
         </if>