Commit e208c1e5 authored by 赵啸非's avatar 赵啸非

修改根据业务查询部门逻辑

parent d97de990
...@@ -65,7 +65,6 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService, ...@@ -65,7 +65,6 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
List<AppEntity> appEntityList = this.service.find(new AppQuery().appCode(entity.getAppCode()), context); List<AppEntity> appEntityList = this.service.find(new AppQuery().appCode(entity.getAppCode()), context);
entity.setApplianceSiteScope(appEntityList.size()); entity.setApplianceSiteScope(appEntityList.size());
entity.setSiteIdList(appEntityList.stream().map(AppEntity::getSiteId).collect(Collectors.toList())); entity.setSiteIdList(appEntityList.stream().map(AppEntity::getSiteId).collect(Collectors.toList()));
SiteEntity siteEntity = siteService.getCache(entity.getSiteId().toString()); SiteEntity siteEntity = siteService.getCache(entity.getSiteId().toString());
if(!ObjectUtils.isEmpty(siteEntity)){ if(!ObjectUtils.isEmpty(siteEntity)){
//请求地址 http://domian/app/siteCode/appcode/html //请求地址 http://domian/app/siteCode/appcode/html
......
...@@ -49,9 +49,6 @@ import static com.mortals.xhx.common.key.Constant.CUSTAPP_ROOT_PATH; ...@@ -49,9 +49,6 @@ import static com.mortals.xhx.common.key.Constant.CUSTAPP_ROOT_PATH;
@RequestMapping("app/version") @RequestMapping("app/version")
public class AppVersionController extends BaseCRUDJsonBodyMappingController<AppVersionService, AppVersionEntity, Long> { public class AppVersionController extends BaseCRUDJsonBodyMappingController<AppVersionService, AppVersionEntity, Long> {
@Autowired
private ParamService paramService;
@Autowired @Autowired
private SiteService siteService; private SiteService siteService;
@Autowired @Autowired
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
and a.matterName like #{condition.matterName} and a.matterName like #{condition.matterName}
</if> </if>
<if test="condition.source!=null and condition.source!=''"> <if test="condition.source!=null and condition.source!=''">
and a.source = #{condition.source,jdbcType=VARCHAR} and a.source = #{condition.source}
</if> </if>
</trim> </trim>
</trim> </trim>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
and a.matterName like #{condition.matterName} and a.matterName like #{condition.matterName}
</if> </if>
<if test="condition.source!=null and condition.source!=''"> <if test="condition.source!=null and condition.source!=''">
and a.source = #{condition.source,jdbcType=VARCHAR} and a.source = #{condition.source}
</if> </if>
</trim> </trim>
</trim> </trim>
......
...@@ -43,8 +43,8 @@ Content-Type: application/json ...@@ -43,8 +43,8 @@ Content-Type: application/json
{ {
"siteId": 54, "siteId": 1,
"matterName": "", "source": 0,
"page": 1, "page": 1,
"size": 10 "size": 10
} }
......
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