yujian
2019-03-01 56e258fa6c23469ea825f6b11d458df9ba577e9f
Merge branch 'div'
3个文件已修改
32 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
@@ -443,6 +443,10 @@
            }
            
            String params = record.getParams();
            if (params != null && params.trim().length() == 0) {
                params = null;
            }
            if (!StringUtil.isNullOrEmpty(params)) {
                
                String jumpValue = systemConfigService.get("jump");
@@ -451,17 +455,32 @@
                }
                
                params = jumpValue.replace("#", params);
                record.setParams(params);
            }
            
            if (!StringUtil.isNullOrEmpty(jumpType)) {
                List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
                if (listByType !=null && listByType.size() > 0) {
                    record.setJumpDetail(listByType.get(0));
                    resultObj.setJumpDetail(listByType.get(0));
                } 
            }
            
            specialService.updateByPrimaryKeySelective(record);
            String name = record.getName();
            if (name != null && name.trim().length() == 0) {
                name = null;
            }
            String remark = record.getRemark();
            if (remark != null && remark.trim().length() == 0) {
                remark = null;
            }
            resultObj.setName(name);
            resultObj.setParams(params);
            resultObj.setShowType(record.getShowType());
            resultObj.setRemark(remark);
            specialService.updateByPrimaryKey(resultObj);
            
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));
            
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -2288,10 +2288,14 @@
                }
            }
            if (listSpecial == null) {
                listSpecial = new ArrayList<Special>();
            }
            JSONObject root = new JSONObject();
            root.put("special", listSpecial);
            out.print(JsonUtil.loadTrueResult(root));
        } catch (Exception e) {
            e.printStackTrace();
        }
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -113,7 +113,6 @@
    
    @Override
    @Cacheable(value = "configCache", key = "'listPageBySystemAndCard-'+#card+'-'+#systemId+'-'+#start +'-'+#count")
    public List<Special> listPageBySystemAndCard(long start, int count, String card, Long systemId) {
        return specialMapper.listPageBySystemAndCard(start, count, card, systemId);
    }