|
@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
|
|
+import io.netty.util.internal.StringUtil;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
@@ -310,7 +311,14 @@ public class workOvertimeController extends JeecgController<workOvertime, IworkO
|
|
|
String viewDate = jsonObject.get("viewDate").toString();
|
|
|
String username = jsonObject.get("username").toString();
|
|
|
List<workOvertime> list = workOvertimeService.getJiaBan(username,viewDate);
|
|
|
- return list;
|
|
|
+ List<workOvertime> list2 = new ArrayList<>();
|
|
|
+ for(workOvertime o:list){
|
|
|
+ if(StringUtil.isNullOrEmpty(o.getSetInfo())){
|
|
|
+ o.setMultiple(null);
|
|
|
+ }
|
|
|
+ list2.add(o);
|
|
|
+ }
|
|
|
+ return list2;
|
|
|
}
|
|
|
|
|
|
}
|