优化：生产地管理模块。

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsMemberOriginController.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -90,6 +91,7 @@ public class UmsMemberOriginController {
     })
     @PostMapping("/list")
     public CommonResult list(@RequestBody UmsMemberOriginParam origin){
+        origin.setCompId(CurrUserUtil.getCompId());
         List<UmsMemberOriginParam> list = umsMemberOriginService.list(origin);
         return CommonResult.success(CommonPage.restPage(list));
     }
@@ -100,6 +102,12 @@ public class UmsMemberOriginController {
     })
     @PostMapping("/save")
     public CommonResult save(@RequestBody @Valid UmsMemberOriginParam origin){
+        if (StringUtils.isEmpty(CurrUserUtil.getCompId())){
+            throw new GlobalException(1,"用户未绑定供应商不能添加生产地!");
+        }
+        origin.setCompId(CurrUserUtil.getCompId());
+        origin.setCompName(CurrUserUtil.getCompName());
+        origin.setCreateId(CurrUserUtil.getUserId());
         int i = umsMemberOriginService.save(origin);
         return CommonResult.success(i);
     }
@@ -110,6 +118,12 @@ public class UmsMemberOriginController {
     })
     @PostMapping("/update")
     public CommonResult update(@RequestBody @Valid UmsMemberOriginParam origin){
+        if (StringUtils.isEmpty(CurrUserUtil.getCompId())){
+            throw new GlobalException(1,"用户未绑定供应商不能编辑生产地!");
+        }
+        origin.setCompId(CurrUserUtil.getCompId());
+        origin.setCompName(CurrUserUtil.getCompName());
+        origin.setUpdateId(CurrUserUtil.getUserId());
         int i= umsMemberOriginService.update(origin);
         if (i > 0){
             return CommonResult.success(i);

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberOriginProductServiceImpl.java

@@ -128,9 +128,7 @@ public class UmsMemberOriginProductServiceImpl implements UmsMemberOriginProduct
         }
 
         //删除
-        int i = 0;
-        if (ids != null && ids.size() > 0)
-            i = umsMemberOriginProductDao.delNotEqIds(ids,originId);
+        int i = umsMemberOriginProductDao.delNotEqIds(ids,originId);
 
         if (saveList != null && saveList.size() > 0){
             i = umsMemberOriginProductDao.batchSave(saveList);

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberOriginServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.util.StringUtils;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -159,6 +160,7 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
             throw new GlobalException(1,"生产地已存在!");
         }
 
+        umsMemberOrigin.setCreateTime(new Date());
         i = umsMemberOriginMapper.insertSelective(umsMemberOrigin); //添加生产地信息
         if (i > 0 && originProductList != null && originProductList.size() > 0) { //添加产地产出物信息
             umsMemberOriginProductService.saveOrUpdate(originProductList,umsMemberOrigin.getId());
@@ -179,6 +181,7 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
             throw new GlobalException(1,"生产地已存在!");
         }
 
+        umsMemberOrigin.setUpdateTime(new Date());
         i = umsMemberOriginMapper.updateByPrimaryKeySelective(umsMemberOrigin); //修改生产地信息
         if (i > 0 && originProductList != null && originProductList.size() > 0) { //添加或修改产地产出物信息
             umsMemberOriginProductService.saveOrUpdate(originProductList,umsMemberOrigin.getId());

forest-admin/admin-server/src/main/resources/dao/UmsMemberOriginProductDao.xml

@@ -56,10 +56,12 @@
         update ums_member_origin_product
         set state = 2
         where fk_origin_id = #{originId,jdbcType=BIGINT}
-        AND id NOT IN
-        <foreach collection="ids" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
+        <if test="ids != null">
+            AND id NOT IN
+            <foreach collection="ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
     </update>
 
     <update id="batchUpdate" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">