Commit 47d9a833 by zhiwj

修改bug

parent 1106026e
...@@ -67,5 +67,5 @@ public interface TabIndexDescMapper { ...@@ -67,5 +67,5 @@ public interface TabIndexDescMapper {
List<TabIndexDesc> listByIds(@Param("ids") List<Integer> indexDescIdList); List<TabIndexDesc> listByIds(@Param("ids") List<Integer> indexDescIdList);
TabIndexDesc getIndexDescByIndexCode(@Param("moduleId") String moduleId, @Param("indexCode") String indexCode); TabIndexDesc getIndexDescByIndexCode(@Param("moduleId") String moduleId, @Param("indexCode") String indexCode, @Param("indexGroupName") String indexGroupName);
} }
\ No newline at end of file
...@@ -27,7 +27,7 @@ public interface IndexDescService { ...@@ -27,7 +27,7 @@ public interface IndexDescService {
List<TabIndexDesc> listByIds(List<Integer> indexDescIdList); List<TabIndexDesc> listByIds(List<Integer> indexDescIdList);
TabIndexDesc getIndexDesc(String moduleId, String indexCode); TabIndexDesc getIndexDesc(String moduleId, String indexCode, String indexGroupName);
void init(Integer enterpriseId); void init(Integer enterpriseId);
} }
...@@ -64,8 +64,8 @@ public class IndexDescServiceImpl implements IndexDescService { ...@@ -64,8 +64,8 @@ public class IndexDescServiceImpl implements IndexDescService {
} }
@Override @Override
public TabIndexDesc getIndexDesc(String moduleId, String indexCode) { public TabIndexDesc getIndexDesc(String moduleId, String indexCode, String indexGroupName) {
return tabIndexDescMapper.getIndexDescByIndexCode(moduleId, indexCode); return tabIndexDescMapper.getIndexDescByIndexCode(moduleId, indexCode, indexGroupName);
} }
@Override @Override
......
...@@ -73,7 +73,7 @@ public class IndexDescApiServiceImpl implements IndexDescApiService { ...@@ -73,7 +73,7 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
@Override @Override
public ServiceResponse<IndexDTO> getIndexDesc(Integer enterpriseId, String moduleId, String indexGroupName, String indexCode) { public ServiceResponse<IndexDTO> getIndexDesc(Integer enterpriseId, String moduleId, String indexGroupName, String indexCode) {
// TabIndex index = indexService.getByIndexCode(moduleId, indexCode); // TabIndex index = indexService.getByIndexCode(moduleId, indexCode);
TabIndexDesc indexDesc = indexDescService.getIndexDesc(moduleId, indexCode); TabIndexDesc indexDesc = indexDescService.getIndexDesc(moduleId, indexCode, indexGroupName);
List<Integer> list = indexModuleRelService.listBusinessIdByModuleId(indexDesc.getIndexDescId().toString(), LogAndUpdateTipsTypeEnum.INDEX.getCode()); List<Integer> list = indexModuleRelService.listBusinessIdByModuleId(indexDesc.getIndexDescId().toString(), LogAndUpdateTipsTypeEnum.INDEX.getCode());
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
Integer indexId = list.get(0); Integer indexId = list.get(0);
......
...@@ -234,6 +234,6 @@ ...@@ -234,6 +234,6 @@
<select id="getIndexDescByIndexCode" resultMap="BaseResultMap"> <select id="getIndexDescByIndexCode" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from tab_index_desc where status = 1 and module_id = #{moduleId} and index_code = #{indexCode} from tab_index_desc where status = 1 and module_id = #{moduleId} and index_code = #{indexCode} and index_group_name = #{indexGroupName}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment