添加优势

company-manager/src/main/java/com/mortals/xhx/common/utils/BeanUtil.java

@@ -145,11 +145,19 @@ public class BeanUtil {
 
     public static void main(String[] args) {
 
-        String str="'";
+/*        String str="'";
         System.out.println(BeanUtil.isConSpeChar(str));
 
-        ObjectMapper mapper = new ObjectMapper();
+        ObjectMapper mapper = new ObjectMapper();*/
         //Map<String, String> map = mapper.readValue(json, Map.class);
+
+
+        Integer a=2500;
+        Integer b=2500;
+        System.out.println(a.equals(b));
+
+
+
     }
 
 }

company-manager/src/main/java/com/mortals/xhx/module/advantage/model/AdvantageEntity.java

@@ -31,6 +31,7 @@ public class AdvantageEntity extends AdvantageVo {
     * 图片
     */
     private String imagePath;
+
     /**
     * 备注
     */

company-manager/src/main/java/com/mortals/xhx/module/type/web/TypeController.java

 package com.mortals.xhx.module.type.web;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.type.model.TypeDetailsEntity;
+import com.mortals.xhx.module.type.model.TypeDetailsQuery;
+import com.mortals.xhx.module.type.service.TypeDetailsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -36,6 +40,9 @@ public class TypeController extends BaseCRUDJsonBodyMappingController<TypeServic
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private TypeDetailsService typeDetailsService;
+
 
     public TypeController(){
         super.setModuleDesc( "类型");
@@ -47,4 +54,14 @@ public class TypeController extends BaseCRUDJsonBodyMappingController<TypeServic
     }
 
 
+    @Override
+    protected int editAfter(Long id, Map<String, Object> model, TypeEntity entity, Context context) throws AppException {
+
+        TypeDetailsQuery typeDetailsQuery = new TypeDetailsQuery();
+        typeDetailsQuery.setTypeId(entity.getId());
+
+        List<TypeDetailsEntity> typeDetailsEntities = typeDetailsService.find(typeDetailsQuery, context);
+        entity.setTypeDetailsList(typeDetailsEntities);
+        return super.editAfter(id, model, entity, context);
+    }
 }
\ No newline at end of file