异常BUG提交

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java

@@ -12,6 +12,7 @@ import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
 import com.foreverwin.mesnac.meapi.service.NcCodeService;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
+import com.sap.me.frame.service.CommonMethods;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -78,6 +79,7 @@ public class AbnormalBillController {
     public R page(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill){
         IPage result;
         QueryWrapper<AbnormalBill> queryWrapper = new QueryWrapper<>();
+        abnormalBill.setSite(CommonMethods.getSite());
         queryWrapper.setEntity(abnormalBill);
         if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
             //TODO modify global query

anomaly/src/main/resources/mapper/AbnormalBillMapper.xml

@@ -437,12 +437,12 @@
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
-                    ${ew.sqlSegment}
+                    AND ${ew.sqlSegment}
                 </if>
             </if>
         </where>
         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
-            ${ew.sqlSegment}
+            AND ${ew.sqlSegment}
         </if>
     </select>