diff --git a/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/OrgDao.java b/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/OrgDao.java index 0e193e0..f99e92d 100644 --- a/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/OrgDao.java +++ b/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/OrgDao.java @@ -4,6 +4,7 @@ import com.bonus.hnrn.rnbmw.manager.entity.OrgBean; import com.bonus.hnrn.rnbmw.manager.entity.ZNode; import com.bonus.hnrn.rnbmw.manager.model.SysUser; import org.springframework.stereotype.Repository; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; public interface OrgDao { List getAll(SysUser user); - List getTeamTypeList(String id); + List getTeamTypeList(@Param("companyId") String id); int addOrg(OrgBean bean); diff --git a/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml b/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml index 495ea2f..6a2d8ba 100644 --- a/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/basic/UserRelationMapper.xml @@ -104,7 +104,7 @@ REPLACE INTO bm_sub_pro_relation(sub_id,pro_id) VALUES (#{subId},#{proId}); diff --git a/HnRealNameBmw/src/main/resources/mappers/jobType/JobTypeMapper.xml b/HnRealNameBmw/src/main/resources/mappers/jobType/JobTypeMapper.xml index 9dd8247..2ace139 100644 --- a/HnRealNameBmw/src/main/resources/mappers/jobType/JobTypeMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/jobType/JobTypeMapper.xml @@ -30,7 +30,7 @@ and instr(job_type,#{params.status}) > 0 - ${params.orderBy} + ORDER BY update_time desc ,id desc limit #{offset}, #{limit} diff --git a/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml b/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml index 90e2cf8..ff8471e 100644 --- a/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml +++ b/HnRealNameBmw/src/main/resources/mappers/manager/OrgMapper.xml @@ -47,8 +47,8 @@ bstt.ID AS id,bstt.`NAME` AS name,'0' AS pId,'0' AS companyId FROM bm_sub_team_type bstt WHERE bstt.IS_ACTIVE = '1' - - and bstt.company_id = #{id} + + AND bstt.company_id = #{companyId}