浏览代码

修改bug

esb 9 年之前
父节点
当前提交
ac3ad61829

+ 1 - 1
Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsCategoryController.java

@ -64,7 +64,7 @@ public class RsCategoryController extends BaseController {
                        s1.append(s.charAt(i));
                }
            }
            rrrd.setRemark(s1.toString());
           // rrrd.setRemark(s1.toString());
            model.addAttribute("model", rrrd);
            model.addAttribute("contentPage", "resource/category/rsCategoryInfoDialog");
        } catch (Exception e) {

+ 2 - 0
Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsCategoryServiceImpl.java

@ -37,6 +37,7 @@ public class RsCategoryServiceImpl implements IRsCategoryService {
    @Transactional
    public Result createCategory(RsResourceCategory rrc) throws Exception {
        RsResourceCategory rrcTemp = rsCategoryDao.getCategoryByNameAndPid(rrc.getName(), rrc.getPid());
       // rrc.setRemark(rrc.getRemark().replace("\n","</br>"));
        if (rrcTemp == null)
            rsCategoryDao.saveEntity(rrc);
        else
@ -47,6 +48,7 @@ public class RsCategoryServiceImpl implements IRsCategoryService {
    @Transactional
    public Result updateCategory(RsResourceCategory rrc) throws Exception {
        RsResourceCategory rrcTemp = rsCategoryDao.getCategoryByNameAndPidWithOutThis(rrc.getName(), rrc.getPid(), rrc.getId());
    //    rrc.setRemark(rrc.getRemark().replace("\n","</br>"));
        if (rrcTemp != null)
            return Result.error("分类名称重复");
        RsResourceCategory rc = rsCategoryDao.getEntity(RsResourceCategory.class, rrc.getId());

+ 2 - 2
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryInfoDialog.jsp

@ -29,8 +29,8 @@
            <div class="m-form-control">
                        <textarea rows="10" name="remark" data-type="text"  class="l-textarea"
                                  style="width:350px;height: 200px"
                        ></textarea>
                                  style="width:350px;height: 170px"
                        >${model.remark}</textarea>
            </div>
        </div>
    <div class="m-form-bottom">

+ 1 - 2
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryInfoDialogJs.jsp

@ -29,8 +29,7 @@
            var data = {
                name: '${model.name}',
                pid: '${model.pid}',
                status: '${model.status}',
                remark: '${model.remark}'
                status: '${model.status}'
            };
            if(data.pid!=""){