|
|
@@ -554,12 +554,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
public boolean checkOrderMain(TOrderTask t) {
|
|
|
List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(t.getOrderNo());
|
|
|
int flag=0;
|
|
|
- if (t.getMain()==1) {
|
|
|
- flag++;
|
|
|
- }
|
|
|
+ if(t.getMain()==1)flag++;
|
|
|
for (TOrderTask t2 : list) {
|
|
|
- if (t2.getMain()==1&&t.getId()==t2.getId()) {
|
|
|
- flag--;
|
|
|
+ if(t2.getMain()==1&&t.getId()==null) {
|
|
|
+ flag++;
|
|
|
+ }else if (t2.getMain()==1&&(!t.getId().equals(t2.getId()))) {
|
|
|
+ flag++;
|
|
|
}
|
|
|
}
|
|
|
if (flag>1) {
|