Merge remote-tracking branch 'origin/master' into master

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FkqkServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DataUtils;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -71,7 +72,10 @@ public class FkqkServiceImpl implements IFkqkService
     @Override
     public int insertFkqk(Fkqk fkqk)
     {
-        fkqk.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
+        String createBy = DataUtils.getValue(fkqk.getArea(), fkqk.getStreet(), fkqk.getCommunity());
+        if(createBy.equals("null"))
+            throw new ServiceException("所选居住地、街道、社区不存在");
+        fkqk.setCreateBy(createBy);
         fkqk.setCreateTime(DateUtils.getNowDate());
         return fkqkMapper.insertFkqk(fkqk);
     }
@@ -85,6 +89,10 @@ public class FkqkServiceImpl implements IFkqkService
     @Override
     public int updateFkqk(Fkqk fkqk)
     {
+        String createBy = DataUtils.getValue(fkqk.getArea(), fkqk.getStreet(), fkqk.getCommunity());
+        if(createBy.equals("null"))
+            throw new ServiceException("所选居住地、街道、社区不存在");
+        fkqk.setCreateBy(createBy);
         fkqk.setUpdateTime(DateUtils.getNowDate());
         return fkqkMapper.updateFkqk(fkqk);
     }