全员收入统计表组织可多选

hr/hr/src/client/nc/ui/hr/baod_orders/view/IncomeStatisticalUI.java

@@ -122,7 +122,7 @@ public class IncomeStatisticalUI extends ToftPanel {
 
 			this.ivjOrgPanel.setBounds(new Rectangle(100, 20));
 			this.ivjOrgPanel.setPreferredSize(new Dimension(170, 20));
-			//this.ivjOrgPanel.setMultiSelectedEnabled(true);
+			this.ivjOrgPanel.setMultiSelectedEnabled(true);
 				this.ivjOrgPanel.addValueChangedListener(new ValueChangedListener() {
 				public void valueChanged(ValueChangedEvent e) {
 					IncomeStatisticalUI.this.initialize();
@@ -1084,7 +1084,7 @@ public class IncomeStatisticalUI extends ToftPanel {
 		if(codeTypein != null && !"".equals(codeTypein)) {
 			sql.append("   WHERE  " + codeTypein);
 		}
-		sql.append(" GROUP BY psncode,psnname,hrorgname,deptname,postname,defname,ismainjob,begindate,enddate  ORDER BY psncode,begindate");
+		sql.append(" GROUP BY psncode,psnname,hrorgname,deptname,postname,defname,ismainjob,begindate,enddate  ORDER BY hrorgname,psncode,begindate");
 		return (ArrayList<Object>) IUAPQueryBS.executeQuery(sql.toString(), new ArrayListProcessor());
 	}