modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
@@ -102,9 +102,11 @@ public Result insert(@RequestBody XhProductModel xhProductModel){ //效验数据 ValidatorUtils.validateEntity(xhProductModel, AddGroup.class, DefaultGroup.class); Integer no = xhProductModelService.getNo(xhProductModel.getPid()); xhProductModel.setSort(no + 1); Integer no = xhProductModelService.getNo(xhProductModel.getPid()); if (xhProductModel.getSort() < no) { xhProductModel.setSort(no + 1); } xhProductModelService.insert(xhProductModel); return Result.ok(); @@ -115,6 +117,7 @@ for(XhProductModel xhProductModel:list){ xhProductModel.setSrcId(xhProductModel.getId()); xhProductModel.setId(null); xhProductModel.setSort(xhProductModel.getSort()); xhProductModel.setProductType(xhProductModel.getNodeType()); this.insert(xhProductModel); } modules/mainPart/src/main/java/com/zt/life/modules/mainPart/sysPictureBase/controller/SysPictureBaseController.java
@@ -89,11 +89,16 @@ sysPictureBaseService.insert(sysPictureBase); } if (sysPictureBase.getIsDefault()==1){ if (pictureBase.getId()==null){ sysPictureBaseService.updateByDefault(sysPictureBase.getId(),sysPictureBase.getProductType()); sysPictureBaseService.updateProdeuctImg(sysPictureBase.getId(),sysPictureBase.getProductType(),null); }else{ if (!sysPictureBase.getId().equals(pictureBase.getId())){ sysPictureBaseService.updateByDefault(sysPictureBase.getId(),sysPictureBase.getProductType()); sysPictureBaseService.updateProdeuctImg(sysPictureBase.getId(),sysPictureBase.getProductType(),pictureBase.getId()); } } } if (file != null) { BufferedImage bufferedImage = null; try { modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml
@@ -32,6 +32,7 @@ and pid is null </if> </where> Group by product_type </select> <select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel"> select a.name, a.id @@ -62,7 +63,8 @@ left join sys_picture_base s on s.id = a.operat_img WHERE a.is_delete = 0 AND ((a.PID = ${productId}) or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10) and a.product_type <> 10)) or (a.PID in (select pid from product_model where id = ${productId} and product_type = 10) and a.product_type <> 10)) </select> <select id="getTaskProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel"> modules/mainPart/src/main/resources/mapper/sysPictureBase/SysPictureBaseDao.xml
@@ -12,14 +12,22 @@ <update id="updateProdeuctImg"> UPDATE product_model_common set operat_img = ${id} where node_type = ${productType} and operat_img =${pictureBaseId} and is_delete = 0; update product_model set operat_img=${id} where product_type = ${productType} and operat_img =${pictureBaseId} <where> node_type = ${productType} and is_delete = 0 <if test="pictureBaseId!=null"> and operat_img =${pictureBaseId} </if> </where> ;update product_model set operat_img=${id} <where> product_type = ${productType} and is_delete = 0 <if test="pictureBaseId!=null"> and operat_img =${pictureBaseId} </if> </where> </update> <select id="getList" resultType="com.zt.life.modules.mainPart.sysPictureBase.model.SysPictureBase"> web/src/views/modules/basicInfo/SelectTyModel.vue
@@ -15,6 +15,7 @@ <el-table-column prop="name" label="名称"/> <zt-table-column-dict v-if="!pageCode" prop="nodeType" label="节点类型" dict="product"/> <zt-table-column-dict v-else prop="productType" label="节点类型" dict="product"/> <el-table-column prop="sort" label="排序"/> </el-table> </zt-table-wraper> </div>
