Browse Source

修改

master
qushutong 1 year ago
parent
commit
e3622082c8
  1. 2
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
  2. 6
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java
  3. 2
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedCompanyServiceImpl.java

2
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml

@ -170,7 +170,7 @@
</update>
<select id="getMaxCategoryCode" resultType="Integer">
<select id="getMaxCategoryCode" resultType="int">
SELECT
IFNULL( MAX(CATEGORY_CODE), 0)
FROM

6
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java

@ -189,10 +189,10 @@ public class YiFengScreenController {
* @Date: 2024/3/21 16:02
*/
@GetMapping("seedCompanyList")
public Result<PageData<IcSeedCompanyDTO>> seedCompanyList(){
public Result<List<IcSeedCompanyDTO>> seedCompanyList(){
Map<String, Object> params = new HashMap<>();
PageData<IcSeedCompanyDTO> page = icSeedCompanyService.page(params);
return new Result<PageData<IcSeedCompanyDTO>>().ok(page);
List<IcSeedCompanyDTO> page = icSeedCompanyService.list(params);
return new Result<List<IcSeedCompanyDTO>>().ok(page);
}
/**

2
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedCompanyServiceImpl.java

@ -67,7 +67,7 @@ public class IcSeedCompanyServiceImpl extends BaseServiceImpl<IcSeedCompanyDao,
QueryWrapper<IcSeedCompanyEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
wrapper.orderByAsc("SORT");
return wrapper;
}

Loading…
Cancel
Save