代码修改

business/base-service/src/main/java/com/yihu/jw/article/service/BaseMenuManageService.java

@@ -661,7 +661,7 @@ public class BaseMenuManageService {
        return list;
    }
    public MixEnvelop findArticleByMenuId(String menuId,String title,Integer page,Integer pageSize){
    public MixEnvelop findArticleByMenuId(String menuId,String title,Integer page,Integer pageSize,String isContent){
        Pageable pageRequest = PageRequest.of(page-1,pageSize);
        List<String> menuIds = new ArrayList<>();
        if (StringUtils.isNoneBlank(menuId)){
@@ -683,8 +683,10 @@ public class BaseMenuManageService {
        }
        List<KnowledgeArticleDictDO> listnew = new ArrayList<>();
        BeanUtils.copyProperties(listnew,list);
        for (KnowledgeArticleDictDO dictDO:list){
            dictDO.setContent(null);
        if(!"1".equals(isContent)){
            for (KnowledgeArticleDictDO dictDO:list){
                dictDO.setContent(null);
            }
        }
        MixEnvelop mixEnvelop = new MixEnvelop();

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/doctor/BaseDoctorRoleInfoEndpoint.java

@@ -72,7 +72,7 @@ public class BaseDoctorRoleInfoEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "查询某一个角色")
    public Envelop getOneRoleInfo(
            @ApiParam(name = "roleId", value = "根据角色标识查询某一个角色信息")
            @RequestParam(value = "roleId", required = true) Integer roleId) throws Exception {
            @RequestParam(value = "roleId", required = true) String roleId) throws Exception {
        JSONObject team = baseDoctorRoleDictService.getOneRoleInfo(roleId);
        if (team.getInteger("status")==-1) {
            return failed(team.getString("msg"));
@@ -92,7 +92,7 @@ public class BaseDoctorRoleInfoEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "生效或失效某个角色")
    public Envelop enableOrDisable(
            @ApiParam(name = "id", value = "角色Id")
            @RequestParam(value = "id", required = true) Integer id,
            @RequestParam(value = "id", required = true) String id,
            @ApiParam(name = "status", value = "生效或失效标识")
            @RequestParam(value = "status", required = true) String status) throws Exception {
        JSONObject jsonObject = baseDoctorRoleDictService.enableOrDisable(id, status);

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/menu/BaseMenuNoLoginEndpoint.java

@@ -60,12 +60,14 @@ public class BaseMenuNoLoginEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "menuId",required = true) String menuId,
            @ApiParam(name = "title", value = "menuId", required = false)
            @RequestParam(value = "title",required = false) String title,
            @ApiParam(name = "isContent", value = "是否返回内容 1是0否", required = false)
            @RequestParam(value = "isContent",required = false) String isContent,
            @ApiParam(name = "page", value = "page", required = false)
            @RequestParam(value = "page",required = true) Integer page,
            @ApiParam(name = "pageSize", value = "pageSize", required = false)
            @RequestParam(value = "pageSize",required = true) Integer pageSize) {
        try {
            return success(menuService.findArticleByMenuId(menuId,title,page,pageSize));
            return success(menuService.findArticleByMenuId(menuId,title,page,pageSize,isContent));
        }catch (Exception e){
            return failedException(e);
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorRoleDictService.java

@@ -54,7 +54,6 @@ public class BaseDoctorRoleDictService extends BaseJpaService<BaseDoctorRoleDict
            result.put("status", -1);
            return result;
        }
        roleInfoDO.setCode(randomString(30));
        baseDoctorRoleDictDao.save(roleInfoDO);
        result.put("status", 200);
        result.put("obj", roleInfoDO);
@@ -114,7 +113,7 @@ public class BaseDoctorRoleDictService extends BaseJpaService<BaseDoctorRoleDict
     * @param roleId 角色id
     * @return
     */
    public JSONObject getOneRoleInfo(Integer roleId){
    public JSONObject getOneRoleInfo(String roleId){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(roleId)){
            result.put("msg","参数错误");
@@ -123,7 +122,7 @@ public class BaseDoctorRoleDictService extends BaseJpaService<BaseDoctorRoleDict
        }
        //角色基本信息
        BaseDoctorRoleDictDO roleInfoDO = baseDoctorRoleDictDao.findById(roleId.toString()).orElse(null);;
        BaseDoctorRoleDictDO roleInfoDO = baseDoctorRoleDictDao.findById(roleId).orElse(null);;
        if(null == roleInfoDO){
            result.put("msg", "角色id不存在");
            result.put("status", -1);
@@ -143,14 +142,14 @@ public class BaseDoctorRoleDictService extends BaseJpaService<BaseDoctorRoleDict
     * @param del
     * @return
     */
    public JSONObject enableOrDisable(Integer roleId,String del){
    public JSONObject enableOrDisable(String roleId,String del){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(roleId) || StringUtils.isEmpty(del)){
            result.put("msg","参数错误");
            result.put("status", -1);
            return result;
        }
        BaseDoctorRoleDictDO roleInfoDO = baseDoctorRoleDictDao.findById(roleId.toString()).orElse(null);;
        BaseDoctorRoleDictDO roleInfoDO = baseDoctorRoleDictDao.findById(roleId).orElse(null);;
        if( null == roleInfoDO ){
            result.put("msg", "角色id不存在");
            result.put("status", -1);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/article/BaseMenuNoLoginEndpoint.java

@@ -64,7 +64,7 @@ public class BaseMenuNoLoginEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "pageSize", value = "pageSize", required = false)
            @RequestParam(value = "pageSize",required = true) Integer pageSize) {
        try {
            return success(menuService.findArticleByMenuId(menuId,title,page,pageSize));
            return success(menuService.findArticleByMenuId(menuId,title,page,pageSize,"0"));
        }catch (Exception e){
            return failedException(e);
        }